diff --git a/app/assets/stylesheets/new_design/forms.scss b/app/assets/stylesheets/new_design/forms.scss
index 95a971cf1..25af18eb4 100644
--- a/app/assets/stylesheets/new_design/forms.scss
+++ b/app/assets/stylesheets/new_design/forms.scss
@@ -193,7 +193,7 @@
     // CAUTION: IE hackery ahead
     &::-ms-expand {
       display: none; // remove default arrow in IE 10 and 11 */
-     }
+    }
 
     // target Internet Explorer 9 to undo the custom arrow */
     @media screen and (min-width:0\0) {
diff --git a/app/assets/stylesheets/new_design/reset.scss b/app/assets/stylesheets/new_design/reset.scss
index e29c0f5f4..0de633a83 100644
--- a/app/assets/stylesheets/new_design/reset.scss
+++ b/app/assets/stylesheets/new_design/reset.scss
@@ -1,6 +1,7 @@
-/* http://meyerweb.com/eric/tools/css/reset/ 
-   v2.0 | 20110126
-   License: none (public domain)
+/*
+  http://meyerweb.com/eric/tools/css/reset/
+  v2.0 | 20110126
+  License: none (public domain)
 */
 
 html, body, div, span, applet, object, iframe,
@@ -12,37 +13,37 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
-	display: block;
+  display: block;
 }
 body {
-	line-height: 1;
+  line-height: 1;
 }
 ol, ul {
-	list-style: none;
+  list-style: none;
 }
 blockquote, q {
-	quotes: none;
+  quotes: none;
 }
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+  content: '';
+  content: none;
 }
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
diff --git a/app/controllers/users/carte_controller.rb b/app/controllers/users/carte_controller.rb
index 89a5eab33..e8ce6d116 100644
--- a/app/controllers/users/carte_controller.rb
+++ b/app/controllers/users/carte_controller.rb
@@ -76,5 +76,5 @@ class Users::CarteController < UsersController
         multipolygone.to_json
       end
     end
-   end
+  end
 end
diff --git a/app/lib/carto/geo_api/pays.json b/app/lib/carto/geo_api/pays.json
index 4eef440b5..b6f24425e 100644
--- a/app/lib/carto/geo_api/pays.json
+++ b/app/lib/carto/geo_api/pays.json
@@ -848,4 +848,4 @@
   {
     "nom": "ZIMBABWE"
   }
-]
\ No newline at end of file
+]
diff --git a/app/mailers/administrateur_mailer.rb b/app/mailers/administrateur_mailer.rb
index e41e9a88f..b31ab2633 100644
--- a/app/mailers/administrateur_mailer.rb
+++ b/app/mailers/administrateur_mailer.rb
@@ -8,7 +8,7 @@ class AdministrateurMailer < ApplicationMailer
     @subject = "N'oubliez pas d'activer votre compte administrateur"
 
     mail(to: administrateur.email,
-         subject: @subject,
-         reply_to: CONTACT_EMAIL)
+      subject: @subject,
+      reply_to: CONTACT_EMAIL)
   end
 end
diff --git a/app/mailers/administration_mailer.rb b/app/mailers/administration_mailer.rb
index d2944805d..e84f70cb6 100644
--- a/app/mailers/administration_mailer.rb
+++ b/app/mailers/administration_mailer.rb
@@ -7,7 +7,7 @@ class AdministrationMailer < ApplicationMailer
     subject = "Création d'un compte admininistrateur"
 
     mail(to: TECH_EMAIL,
-         subject: subject)
+      subject: subject)
   end
 
   def invite_admin(admin, reset_password_token, administration_id)
@@ -17,16 +17,16 @@ class AdministrationMailer < ApplicationMailer
     subject = "Activez votre compte administrateur"
 
     mail(to: admin.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def refuse_admin(admin_email)
     subject = "Votre demande de compte a été refusée"
 
     mail(to: admin_email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def dubious_procedures(procedures_and_type_de_champs)
@@ -34,6 +34,6 @@ class AdministrationMailer < ApplicationMailer
     subject = "[RGS] De nouvelles démarches comportent des champs interdits"
 
     mail(to: EQUIPE_EMAIL,
-         subject: subject)
+      subject: subject)
   end
 end
diff --git a/app/mailers/gestionnaire_mailer.rb b/app/mailers/gestionnaire_mailer.rb
index 87e822a03..105eb7243 100644
--- a/app/mailers/gestionnaire_mailer.rb
+++ b/app/mailers/gestionnaire_mailer.rb
@@ -7,8 +7,8 @@ class GestionnaireMailer < ApplicationMailer
     subject = "Activez votre compte instructeur"
 
     mail(to: gestionnaire.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def user_to_gestionnaire(email)
diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index eff179b52..0cf3752cb 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -20,7 +20,7 @@ class InviteMailer < ApplicationMailer
     email = invite.email
 
     mail(to: email,
-         subject: subject,
-         reply_to: reply_to)
+      subject: subject,
+      reply_to: reply_to)
   end
 end
diff --git a/app/mailers/preactivate_users_mailer.rb b/app/mailers/preactivate_users_mailer.rb
index 408ea5a54..169c65671 100644
--- a/app/mailers/preactivate_users_mailer.rb
+++ b/app/mailers/preactivate_users_mailer.rb
@@ -26,8 +26,8 @@ class PreactivateUsersMailer < ApplicationMailer
     END_OF_MAIL
 
     mail(to: model.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL,
-         body: body)
+      subject: subject,
+      reply_to: CONTACT_EMAIL,
+      body: body)
   end
 end
diff --git a/app/models/concerns/tags_substitution_concern.rb b/app/models/concerns/tags_substitution_concern.rb
index a3c6c5cf3..b4e194186 100644
--- a/app/models/concerns/tags_substitution_concern.rb
+++ b/app/models/concerns/tags_substitution_concern.rb
@@ -193,7 +193,7 @@ module TagsSubstitutionConcern
     tags_and_datas
       .map { |(tags, data)| [filter_tags(tags), data] }
       .inject(text) { |acc, (tags, data)| replace_tags_with_values_from_data(acc, tags, data) }
-   end
+  end
 
   def replace_type_de_champ_tags(text, types_de_champ, dossier_champs)
     types_de_champ.inject(text) do |acc, tag|
diff --git a/app/views/admin/procedures/publish.js.erb b/app/views/admin/procedures/publish.js.erb
index 04a6b2229..9c11731ef 100644
--- a/app/views/admin/procedures/publish.js.erb
+++ b/app/views/admin/procedures/publish.js.erb
@@ -1 +1 @@
-<%= "togglePathMessage(true, #{@mine})" %>
\ No newline at end of file
+<%= "togglePathMessage(true, #{@mine})" %>
diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml
index df439eb7d..a5c537296 100644
--- a/app/views/dossiers/_edit_pieces_jointes.html.haml
+++ b/app/views/dossiers/_edit_pieces_jointes.html.haml
@@ -3,9 +3,9 @@
     - if @facade.dossier.types_de_piece_justificative.size > 0
       .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
         %a#maj_pj.action{ "data-target" => "#upload-pj-modal",
-                           "data-toggle" => "modal",
-                           :type => "button",
-                           style: 'margin-bottom: 15px; margin-top: -30px;' }
+                          "data-toggle" => "modal",
+                          :type => "button",
+                          style: 'margin-bottom: 15px; margin-top: -30px;' }
           Modifier les documents
         %br
         = render partial: 'users/recapitulatif/modal_upload_pj'
diff --git a/app/views/dossiers/add_siret.js.erb b/app/views/dossiers/add_siret.js.erb
index fe0cdc53c..2ec6c4aa5 100644
--- a/app/views/dossiers/add_siret.js.erb
+++ b/app/views/dossiers/add_siret.js.erb
@@ -9,4 +9,4 @@ error_form_siret('<%= invalid_siret %>');
 
 function render_new_siret(){
     $('.row.etape.etape-2').html("<%= escape_javascript(render partial: '/dossiers/etapes/etape_2/entreprise', locals: { facade: @facade } ) %>");
-}
\ No newline at end of file
+}
diff --git a/app/views/dossiers/new_siret.js.erb b/app/views/dossiers/new_siret.js.erb
index a84df50d7..123aaf8db 100644
--- a/app/views/dossiers/new_siret.js.erb
+++ b/app/views/dossiers/new_siret.js.erb
@@ -10,4 +10,4 @@ error_form_siret('<%= invalid_siret %>');
 
 function render_new_siret(){
     $('.row.etape.etape-2').html("<%= escape_javascript(render partial: '/dossiers/etapes/etape2', locals: { facade: @facade } ) %>");
-}
\ No newline at end of file
+}
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index d6c21977c..b1d1b5381 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -3,4 +3,4 @@
 
 <% end -%>
 <br>
-<%= link_to "Mot de passe oublié ?", new_password_path(resource_name) %><br />
\ No newline at end of file
+<%= link_to "Mot de passe oublié ?", new_password_path(resource_name) %><br />
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 363a2a904..638b058ab 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -158,7 +158,7 @@ fr:
       invalid_siret: "Le siret est incorrect"
       procedure_not_found: "La démarche n'existe pas"
       france_connect:
-       connexion: "Erreur lors de la connexion à France Connect."
+        connexion: "Erreur lors de la connexion à France Connect."
       extension_white_list_error: "Le format de fichier de la pièce jointe n'est pas valide."
       procedure_archived: "Cette démarche en ligne a été fermée, il n'est plus possible de déposer de dossier."
 
diff --git a/lib/cellar/amazon_v2_request_signer.rb b/lib/cellar/amazon_v2_request_signer.rb
index 6e2146b59..67891e00d 100644
--- a/lib/cellar/amazon_v2_request_signer.rb
+++ b/lib/cellar/amazon_v2_request_signer.rb
@@ -36,7 +36,7 @@ module Cellar
       canonicalized_amz_headers = ""
       canonicalized_resource = "/#{@bucket}/#{key}"
       string_to_sign = "#{method}\n#{checksum}\n#{content_type}\n#{expires}#{date}\n" +
-                       "#{canonicalized_amz_headers}#{canonicalized_resource}"
+        "#{canonicalized_amz_headers}#{canonicalized_resource}"
       Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), @secret_access_key, string_to_sign)).strip
     end
   end
diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb
index ff8ffb920..3536c64d1 100644
--- a/spec/controllers/admin/procedures_controller_spec.rb
+++ b/spec/controllers/admin/procedures_controller_spec.rb
@@ -691,9 +691,9 @@ describe Admin::ProceduresController, type: :controller do
       let(:procedure) { create :procedure, :published, administrateur: admin }
 
       before do
-         subject
-         procedure.reload
-       end
+        subject
+        procedure.reload
+      end
 
       it { expect(procedure.hidden_at).not_to be_nil }
       it { expect(procedure.procedure_path).to be_nil }
diff --git a/spec/lib/carto/sgmap/api_spec.rb b/spec/lib/carto/sgmap/api_spec.rb
index d84f62cea..a13a7a571 100644
--- a/spec/lib/carto/sgmap/api_spec.rb
+++ b/spec/lib/carto/sgmap/api_spec.rb
@@ -55,7 +55,7 @@ describe CARTO::SGMAP::API do
     before do
       stub_request(:post, "https://apicarto.sgmap.fr/cadastre/geometrie")
         .with(:body => /.*/,
-             :headers => { 'Content-Type' => 'application/json' })
+          :headers => { 'Content-Type' => 'application/json' })
         .to_return(status: status, body: body)
     end
     context 'when geojson is empty' do
diff --git a/spec/models/concern/email_sanitizable_concern_spec.rb b/spec/models/concern/email_sanitizable_concern_spec.rb
index 7b98b7d82..810a8be42 100644
--- a/spec/models/concern/email_sanitizable_concern_spec.rb
+++ b/spec/models/concern/email_sanitizable_concern_spec.rb
@@ -2,21 +2,21 @@ describe EmailSanitizableConcern, type: :model do
   describe 'sanitize_email' do
     let(:email_concern) do
       (Class.new do
-         include EmailSanitizableConcern
-         attr_accessor :email
+        include EmailSanitizableConcern
+        attr_accessor :email
 
-         def initialize(email)
-           self.email = email
-         end
+        def initialize(email)
+          self.email = email
+        end
 
-         def [](key)
-           self.send(key)
-         end
+        def [](key)
+          self.send(key)
+        end
 
-         def []=(key, value)
-           self.send("#{key}=", value)
-         end
-       end).new(email)
+        def []=(key, value)
+          self.send("#{key}=", value)
+        end
+      end).new(email)
     end
 
     before do
diff --git a/spec/models/concern/tags_substitution_concern_spec.rb b/spec/models/concern/tags_substitution_concern_spec.rb
index 966c658b0..52718bee6 100644
--- a/spec/models/concern/tags_substitution_concern_spec.rb
+++ b/spec/models/concern/tags_substitution_concern_spec.rb
@@ -14,17 +14,17 @@ describe TagsSubstitutionConcern, type: :model do
 
   let(:template_concern) do
     (Class.new do
-       include TagsSubstitutionConcern
+      include TagsSubstitutionConcern
 
-       def initialize(p, s)
-         @procedure = p
-         self.class.const_set(:DOSSIER_STATE, s)
-       end
+      def initialize(p, s)
+        @procedure = p
+        self.class.const_set(:DOSSIER_STATE, s)
+      end
 
-       def procedure
-         @procedure
-       end
-     end).new(procedure, state)
+      def procedure
+        @procedure
+      end
+    end).new(procedure, state)
   end
 
   describe 'replace_tags' do
diff --git a/spec/support/files/ban_address_search.json b/spec/support/files/ban_address_search.json
index ac00ec114..53b0773ee 100644
--- a/spec/support/files/ban_address_search.json
+++ b/spec/support/files/ban_address_search.json
@@ -114,4 +114,4 @@
       "type": "Feature"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/ban_address_search_no_result.json b/spec/support/files/ban_address_search_no_result.json
index 1c2078f75..57f67f444 100644
--- a/spec/support/files/ban_address_search_no_result.json
+++ b/spec/support/files/ban_address_search_no_result.json
@@ -6,4 +6,4 @@
   "query": "Paris",
   "type": "FeatureCollection",
   "features": []
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/entreprise.json b/spec/support/files/entreprise.json
index 0c4cbb294..55a1f4e8c 100644
--- a/spec/support/files/entreprise.json
+++ b/spec/support/files/entreprise.json
@@ -180,4 +180,4 @@
     }
   },
   "gateway_error": false
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/etablissement.json b/spec/support/files/etablissement.json
index 6dc828828..835a18bf1 100644
--- a/spec/support/files/etablissement.json
+++ b/spec/support/files/etablissement.json
@@ -46,4 +46,4 @@
     }
   },
   "gateway_error": false
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/request_cadastre.json b/spec/support/files/geojson/request_cadastre.json
index cacad9232..2093a4b0e 100644
--- a/spec/support/files/geojson/request_cadastre.json
+++ b/spec/support/files/geojson/request_cadastre.json
@@ -29,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/request_qp.json b/spec/support/files/geojson/request_qp.json
index 627166c9a..0531fb480 100644
--- a/spec/support/files/geojson/request_qp.json
+++ b/spec/support/files/geojson/request_qp.json
@@ -26,4 +26,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/response_cadastre.json b/spec/support/files/geojson/response_cadastre.json
index ae2ffd4b0..549d9d886 100644
--- a/spec/support/files/geojson/response_cadastre.json
+++ b/spec/support/files/geojson/response_cadastre.json
@@ -1214,4 +1214,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/response_qp.json b/spec/support/files/geojson/response_qp.json
index 60bfc70be..4cb2b4104 100644
--- a/spec/support/files/geojson/response_qp.json
+++ b/spec/support/files/geojson/response_qp.json
@@ -27,4 +27,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/rna.json b/spec/support/files/rna.json
index 057af35c5..39754f549 100644
--- a/spec/support/files/rna.json
+++ b/spec/support/files/rna.json
@@ -27,4 +27,4 @@
     "mise_a_jour": 1392295833
   },
   "date_extraction_donnees": 1427210585
-}
\ No newline at end of file
+}