diff --git a/.rubocop.yml b/.rubocop.yml
index 0217ec321..afb11910f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,7 +14,7 @@ Bundler/InsecureProtocolSource:
   Enabled: true
 
 Bundler/OrderedGems:
-  Enabled: false
+  Enabled: true
 
 Gemspec/DuplicatedAssignment:
   Enabled: true
diff --git a/Gemfile b/Gemfile
index 35c4a2544..1fabe7f8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,177 +1,104 @@
 source 'https://rubygems.org'
 
-# dotenv should always be loaded before rails
-gem 'dotenv-rails', require: 'dotenv/rails-now'
-gem 'rails'
-
-# Use SCSS for stylesheets
-gem 'sassc-rails'
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-
-# Enable deep clone of active record models
-gem 'deep_cloneable'
-
-gem 'warden'
-
-# Use Puma as the app server
-gem 'puma'
-
-# serializer
+gem 'aasm'
+gem 'active_link_to' # Automatically set a class on active links
 gem 'active_model_serializers'
-
-# haml
-gem 'haml-rails'
-
-# bootstrap saas
+gem 'activestorage-openstack', git: 'https://github.com/fredZen/activestorage-openstack.git', branch: 'frederic/fix_upload_signature'
+gem 'administrate'
+gem 'after_party'
+gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365
+gem 'bcrypt'
 gem 'bootstrap-sass', '~> 3.3.5'
-
-# Automatically set a class on active links
-gem 'active_link_to'
-
-# Pagination
-gem 'kaminari'
-
-# Gestion des comptes utilisateurs
-gem 'devise'
-gem 'devise-async'
-gem 'openid_connect'
-gem 'omniauth-github'
-
-# Locales par défaut
-gem 'rails-i18n'
-
-gem 'rest-client'
-gem 'typhoeus'
-
-gem 'clamav-client', require: 'clamav/client'
-
+gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
+gem 'browser'
 gem 'carrierwave'
 gem 'carrierwave-i18n'
-gem 'copy_carrierwave_file'
-gem 'fog-openstack'
-gem 'activestorage-openstack', git: 'https://github.com/fredZen/activestorage-openstack.git', branch: 'frederic/fix_upload_signature'
-
-gem 'pg'
-
-gem 'bcrypt'
-
-gem 'rgeo-geojson'
-
 gem 'chartkick'
-
+gem 'chunky_png'
+gem 'clamav-client', require: 'clamav/client'
+gem 'copy_carrierwave_file'
+gem 'daemons'
+gem 'deep_cloneable' # Enable deep clone of active record models
+gem 'delayed_cron_job' # Cron jobs
+gem 'delayed_job_active_record'
+gem 'delayed_job_web'
+gem 'devise' # Gestion des comptes utilisateurs
+gem 'devise-async'
+gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
+gem 'flipflop'
+gem 'fog-openstack'
+gem 'font-awesome-rails'
+gem 'groupdate'
+gem 'haml-rails'
+gem 'hashie'
+gem 'jquery-rails' # Use jquery as the JavaScript library
+gem 'kaminari' # Pagination
 gem 'lograge'
 gem 'logstash-event'
-
-gem 'font-awesome-rails'
-
-gem 'hashie'
-
 gem 'mailjet'
-
-gem "premailer-rails"
-
-gem 'smart_listing'
-
-gem 'groupdate'
-
-gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
-
-gem 'spreadsheet_architect'
-gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365
-
+gem 'omniauth-github'
+gem 'openid_connect'
 gem 'openstack'
-
-gem 'browser'
-
-gem 'simple_form'
-
-gem 'skylight'
-
-gem 'scenic'
-
+gem 'pg'
+gem 'prawn' # PDF Generation
+gem 'prawn_rails'
+gem 'premailer-rails'
+gem 'puma' # Use Puma as the app server
+gem 'rack-mini-profiler'
+gem 'rails'
+gem 'rails-i18n' # Locales par défaut
+gem 'rake-progressbar', require: false
+gem 'rest-client'
+gem 'rgeo-geojson'
 gem 'sanitize-url'
-
-gem 'flipflop'
-
-gem 'aasm'
-
+gem 'sassc-rails' # Use SCSS for stylesheets
+gem 'scenic'
+gem 'select2-rails'
+gem 'sentry-raven'
+gem 'simple_form'
+gem 'skylight'
+gem 'smart_listing'
+gem 'spreadsheet_architect'
+gem 'turbolinks' # Turbolinks makes following links in your web application faster
+gem 'typhoeus'
+gem 'warden'
 gem 'webpacker', '>= 4.0.x'
-
-gem 'after_party'
-
 gem 'zxcvbn-ruby', require: 'zxcvbn'
 
-# Cron jobs
-gem 'delayed_job_active_record'
-gem "daemons"
-gem 'delayed_cron_job'
-gem "delayed_job_web"
-gem 'select2-rails'
-
-# PDF Generation
-gem 'prawn'
-gem 'prawn_rails'
-
-gem 'chunky_png'
-gem 'sentry-raven'
-
-gem "administrate"
-
-gem 'rack-mini-profiler'
-
-gem 'rake-progressbar', require: false
-
 group :test do
-  gem 'launchy'
-  gem 'factory_bot'
+  gem 'capybara' # Integration testing
+  gem 'capybara-email' # Access emails during integration tests
+  gem 'capybara-screenshot' # Save a dump of the page when an integration test fails
+  gem 'capybara-selenium'
   gem 'database_cleaner'
-  gem 'webmock'
+  gem 'factory_bot'
+  gem 'guard'
+  gem 'guard-livereload', require: false
+  gem 'guard-rspec', require: false
+  gem 'launchy'
+  gem 'rails-controller-testing'
   gem 'shoulda-matchers', require: false
   gem 'timecop'
-  gem 'guard'
-  gem 'guard-rspec', require: false
-  gem 'guard-livereload', require: false
   gem 'vcr'
-  gem 'rails-controller-testing'
-
-  # Integration testing
-  gem 'capybara'
-  gem 'capybara-selenium'
-  # Save a dump of the page when an integration test fails
-  gem 'capybara-screenshot'
-  # Access emails during integration tests
-  gem 'capybara-email'
+  gem 'webmock'
 end
 
 group :development do
   gem 'brakeman', require: false
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console'
-  gem 'rack-handlers'
-  gem 'xray-rails'
+  gem 'haml-lint'
+  gem 'letter_opener_web'
   gem 'rubocop', require: false
   gem 'rubocop-rspec-focused', require: false
-  gem 'haml-lint'
   gem 'scss_lint', require: false
-  gem 'letter_opener_web'
+  gem 'xray-rails'
 end
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
+  gem 'byebug' # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'mina', git: 'https://github.com/mina-deploy/mina.git', require: false # Deploy
   gem 'pry-byebug'
-
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-commands-rspec'
   gem 'rspec-rails'
-
-  # Deploy
-  gem 'mina', git: 'https://github.com/mina-deploy/mina.git', require: false
-
   gem 'rspec_junit_formatter'
+  gem 'spring' # Spring speeds up development by keeping your application running in the background
+  gem 'spring-commands-rspec'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index aaa1e7bef..1337f9a9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,7 +101,6 @@ GEM
       axlsx (>= 2.0, < 4)
     bcrypt (3.1.12)
     bindata (2.4.4)
-    bindex (0.5.0)
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -410,8 +409,6 @@ GEM
     public_suffix (3.0.3)
     puma (3.12.0)
     rack (2.0.6)
-    rack-handlers (0.7.3)
-      rack
     rack-mini-profiler (1.0.1)
       rack (>= 1.2.0)
     rack-oauth2 (1.9.3)
@@ -621,11 +618,6 @@ GEM
     vcr (4.0.0)
     warden (1.2.8)
       rack (>= 2.0.6)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      bindex (>= 0.4.0)
-      railties (>= 5.0)
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
@@ -710,7 +702,6 @@ DEPENDENCIES
   premailer-rails
   pry-byebug
   puma
-  rack-handlers
   rack-mini-profiler
   rails
   rails-controller-testing
@@ -740,7 +731,6 @@ DEPENDENCIES
   typhoeus
   vcr
   warden
-  web-console
   webmock
   webpacker (>= 4.0.x)
   xray-rails