6 files changed, 27 insertions, 8 deletions
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index b439821d2..8f0eb6c10 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -38,7 +38,8 @@ Apartment.configure do |config|
     "ReferentialCloning",
     "Workbench",
     "CleanUp",
-    "CleanUpResult"
+    "CleanUpResult",
+    "Calendar"
   ]
 
   # use postgres schemas?
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 9ca59134e..b53dba3d8 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( base.css application_new.css es6_browserified/*.js )
+Rails.application.config.assets.precompile += %w( base.css es6_browserified/*.js )
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
new file mode 100644
index 000000000..c7262b8a0
--- /dev/null
+++ b/config/initializers/locale.rb
@@ -0,0 +1,13 @@
+require 'i18n/backend/active_record'
+Translation  = I18n::Backend::ActiveRecord::Translation
+
+if Translation.table_exists?
+  I18n.backend = I18n::Backend::ActiveRecord.new
+
+  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Memoize)
+  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Flatten)
+  I18n::Backend::Simple.send(:include, I18n::Backend::Memoize)
+  I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+
+  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Simple.new, I18n.backend)
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
new file mode 100644
index 000000000..52ec93250
--- /dev/null
+++ b/config/initializers/sidekiq.rb
@@ -0,0 +1,7 @@
+Sidekiq.configure_server do |config|
+  pendings = [
+    LineReferential.find_by(name: 'CodifLigne').line_referential_syncs.pending.take,
+    StopAreaReferential.find_by(name: 'Reflex').stop_area_referential_syncs.pending.take
+  ]
+  pendings.compact.map{|sync| sync.failed({error: 'Failed by Sidekiq reboot', processing_time: 0})}
+end
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index be0f4bf55..67dfe1ceb 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -58,9 +58,9 @@ SimpleForm.setup do |config|
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
-    b.use :label, class: 'col-sm-3 control-label'
+    b.use :label, class: 'col-sm-4 control-label'
 
-    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+    b.wrapper tag: 'div', class: 'col-sm-8' do |ba|
       ba.use :input, class: 'form-control'
       ba.use :error, wrap_with: { tag: 'span', class: 'help-block small' }
       ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block small' }
diff --git a/config/initializers/stif.rb b/config/initializers/stif.rb
index 1a896ba21..6a79cadc8 100644
--- a/config/initializers/stif.rb
+++ b/config/initializers/stif.rb
@@ -1,11 +1,9 @@
 Rails.application.config.to_prepare do
   Organisation.after_create do |organisation|
-    line_referential = LineReferential.find_by(name: "CodifLigne")
+    line_referential      = LineReferential.find_by(name: "CodifLigne")
     stop_area_referential = StopAreaReferential.find_by(name: "Reflex")
 
-    stif = Organisation.find_by(name: "STIF")
-
-    organisation.workbenches.find_or_create_by(name: "Gestion de l'offre", organisation: stif) do |workbench|
+    organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |workbench|
       workbench.line_referential      = line_referential
       workbench.stop_area_referential = stop_area_referential