From 359807b4f7f7f8a8ff337ce328fc633108d34bd3 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Tue, 14 Mar 2017 10:45:59 +0100 Subject: [PATCH 1/9] Procedure has an auto_archive date --- app/controllers/admin/procedures_controller.rb | 7 +++++-- app/views/admin/procedures/_informations.html.haml | 9 +++++++++ .../20170313140834_add_auto_archive_to_procedure.rb | 5 +++++ db/schema.rb | 3 ++- spec/models/drop_down_list_spec.rb | 8 -------- 5 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20170313140834_add_auto_archive_to_procedure.rb diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index fa04bb72d..26147a6b4 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -80,6 +80,8 @@ class Admin::ProceduresController < AdminController return render 'edit' end + puts procedure_params + flash.notice = 'Procédure modifiée' redirect_to edit_admin_procedure_path(id: @procedure.id) end @@ -193,10 +195,11 @@ class Admin::ProceduresController < AdminController private def procedure_params + editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :lien_notice, :euro_flag, :logo, :auto_archive_on] if @procedure.try(:locked?) - params.require(:procedure).permit(:libelle, :description, :organisation, :direction, :lien_site_web, :lien_notice, :euro_flag, :logo) + params.require(:procedure).permit(*editable_params) else - params.require(:procedure).permit(:libelle, :description, :organisation, :direction, :lien_site_web, :lien_notice, :euro_flag, :logo, :lien_demarche, :cerfa_flag, :for_individual, :individual_with_siret, module_api_carto_attributes: [:id, :use_api_carto, :quartiers_prioritaires, :cadastre]).merge(administrateur_id: current_administrateur.id) + params.require(:procedure).permit(*editable_params, :lien_demarche, :cerfa_flag, :for_individual, :individual_with_siret, module_api_carto_attributes: [:id, :use_api_carto, :quartiers_prioritaires, :cadastre]).merge(administrateur_id: current_administrateur.id) end end diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 833f5fee3..aede257cf 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -80,3 +80,12 @@ %label = f.check_box :individual_with_siret Donner la possibilité de renseigner un SIRET au cours de la construction du dossier. + .col-md-6 + %h4 Options avancées + + %label{ for: :auto_archive_on} Archivage automatique le + = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-format' => 'dd/mm/yyyy' } + (à 00h00 ) + + + diff --git a/db/migrate/20170313140834_add_auto_archive_to_procedure.rb b/db/migrate/20170313140834_add_auto_archive_to_procedure.rb new file mode 100644 index 000000000..7d7275651 --- /dev/null +++ b/db/migrate/20170313140834_add_auto_archive_to_procedure.rb @@ -0,0 +1,5 @@ +class AddAutoArchiveToProcedure < ActiveRecord::Migration[5.0] + def change + add_column :procedures, :auto_archive_on, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index db86ebfaf..0ff0aa06a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170307092820) do +ActiveRecord::Schema.define(version: 20170313140834) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -344,6 +344,7 @@ ActiveRecord::Schema.define(version: 20170307092820) do t.string "lien_notice" t.boolean "for_individual", default: false t.boolean "individual_with_siret", default: false + t.date "auto_archive_on" end create_table "quartier_prioritaires", force: :cascade do |t| diff --git a/spec/models/drop_down_list_spec.rb b/spec/models/drop_down_list_spec.rb index 523ab2ae1..9485bc7ee 100644 --- a/spec/models/drop_down_list_spec.rb +++ b/spec/models/drop_down_list_spec.rb @@ -1,14 +1,6 @@ require 'spec_helper' describe DropDownList do - describe 'database columns' do - it { is_expected.to have_db_column(:value) } - end - - describe 'associations' do - it { is_expected.to belong_to(:type_de_champ) } - end - describe '#options' do let(:value) { "Cohésion sociale Dév.Eco / Emploi From 24d17dc0f3cc8d7c8c3570d14be98aefad925955 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 12:40:59 +0100 Subject: [PATCH 2/9] Sidekiq worker to archive procedures automatically + tests --- Gemfile | 4 + Gemfile.lock | 34 +++++++- app/models/dossier.rb | 4 +- app/models/procedure.rb | 6 +- .../admin/procedures/_informations.html.haml | 3 + app/workers/auto_archive_procedure_worker.rb | 14 ++++ config/initializers/sidekiq.rb | 7 ++ config/routes.rb | 6 +- config/schedule.yml | 3 + config/sidekiq.yml | 7 ++ .../auto_archive_procedure_worker_spec.rb | 78 +++++++++++++++++++ 11 files changed, 155 insertions(+), 11 deletions(-) create mode 100644 app/workers/auto_archive_procedure_worker.rb create mode 100644 config/initializers/sidekiq.rb create mode 100644 config/schedule.yml create mode 100644 config/sidekiq.yml create mode 100644 spec/workers/auto_archive_procedure_worker_spec.rb diff --git a/Gemfile b/Gemfile index 3b1aa7926..b7f030edc 100644 --- a/Gemfile +++ b/Gemfile @@ -102,6 +102,10 @@ gem 'simple_form' gem 'newrelic_rpm' +gem 'sidekiq' +gem 'sidekiq-cron', '~> 0.4.4' +gem 'sinatra', github: 'sinatra', require: false + group :test do gem 'capybara' gem 'launchy' diff --git a/Gemfile.lock b/Gemfile.lock index f0e40cf8e..facff428a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: git://github.com/sinatra/sinatra.git + revision: d0c4053fd459be9f2c207cfeec5c0606461c014b + specs: + rack-protection (2.0.0.rc1) + rack + sinatra (2.0.0.rc1) + mustermann (= 1.0.0) + rack (~> 2.0) + rack-protection (= 2.0.0.rc1) + tilt (~> 2.0) + GIT remote: https://github.com/mina-deploy/mina.git revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a @@ -114,6 +126,7 @@ GEM execjs coffee-script-source (1.11.1) concurrent-ruby (1.0.2) + connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) database_cleaner (1.5.3) @@ -333,7 +346,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) json-jwt (1.7.0) activesupport bindata @@ -382,6 +395,7 @@ GEM minitest (5.10.1) multi_json (1.12.1) multipart-post (2.0.0) + mustermann (1.0.0) nenv (0.3.0) netrc (0.11.0) newrelic_rpm (3.18.1.330) @@ -476,7 +490,9 @@ GEM nokogiri (~> 1.5) trollop (~> 2.1) rdoc (4.3.0) - redis (3.3.0) + redis (3.3.3) + redis-namespace (1.5.3) + redis (~> 3.0, >= 3.0.4) ref (2.0.0) request_store (1.3.1) responders (2.3.0) @@ -528,6 +544,8 @@ GEM ruby_parser (3.8.3) sexp_processor (~> 4.1) rubyzip (1.0.0) + rufus-scheduler (3.3.4) + tzinfo safe_yaml (1.0.4) sass (3.4.22) sass-rails (5.0.6) @@ -553,6 +571,15 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) + sidekiq (4.2.9) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) + redis (~> 3.2, >= 3.2.1) + sidekiq-cron (0.4.5) + redis-namespace (>= 1.5.2) + rufus-scheduler (>= 2.0.24) + sidekiq (>= 4.2.1) simple_form (3.4.0) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) @@ -712,8 +739,11 @@ DEPENDENCIES selenium-webdriver sentry-raven shoulda-matchers + sidekiq + sidekiq-cron (~> 0.4.4) simple_form simplecov + sinatra! smart_listing spreadsheet_architect spring diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 00afd691e..7002b2ab9 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -181,9 +181,7 @@ class Dossier < ActiveRecord::Base where(state: WAITING_FOR_USER, archived: false).order("updated_at #{order}") end - def self.en_construction order = 'ASC' - where(state: EN_CONSTRUCTION, archived: false).order("updated_at #{order}") - end + scope :en_construction, -> { where(state: EN_CONSTRUCTION, archived: false).order(updated_at: :asc) } def self.ouvert order = 'ASC' where(state: OUVERT, archived: false).order("updated_at #{order}") diff --git a/app/models/procedure.rb b/app/models/procedure.rb index 947499b30..0432c6165 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -46,6 +46,8 @@ class Procedure < ActiveRecord::Base alias_method_chain "#{name.underscore.to_sym}".to_s, :override end + scope :not_archived, -> { where(archived: false) } + def path procedure_path.path unless procedure_path.nil? end @@ -66,10 +68,6 @@ class Procedure < ActiveRecord::Base types_de_piece_justificative.order(:order_place) end - def self.not_archived id - Procedure.where(archived: false).find(id) - end - def self.active id Procedure.where(archived: false, published: true).find(id) end diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index aede257cf..914e51f83 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -86,6 +86,9 @@ %label{ for: :auto_archive_on} Archivage automatique le = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-format' => 'dd/mm/yyyy' } (à 00h00 ) + %p.help-block + %i.fa.fa-info-circle + L'archivage automatique de la procédure entrainera le passage en instruction de tous les dossiers en construction. diff --git a/app/workers/auto_archive_procedure_worker.rb b/app/workers/auto_archive_procedure_worker.rb new file mode 100644 index 000000000..61701b4ff --- /dev/null +++ b/app/workers/auto_archive_procedure_worker.rb @@ -0,0 +1,14 @@ +class AutoArchiveProcedureWorker + include Sidekiq::Worker + + def perform(*args) + procedures_to_archive = Procedure.not_archived.where("auto_archive_on <= ?", Date.today) + + procedures_to_archive.each do |p| + p.dossiers.en_construction.update_all(state: :received) + end + + procedures_to_archive.update_all(archived: true, auto_archive_on: nil) + + end +end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb new file mode 100644 index 000000000..f5dd670d6 --- /dev/null +++ b/config/initializers/sidekiq.rb @@ -0,0 +1,7 @@ +Sidekiq.configure_server do |config| + Sidekiq::Logging.logger = Rails.logger + + schedule_file = "config/schedule.yml" + Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file) +end + diff --git a/config/routes.rb b/config/routes.rb index 716893f09..fb40e341b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -207,7 +207,9 @@ Rails.application.routes.draw do get '/:procedure_path' => '/users/dossiers#commencer' end - apipie + require 'sidekiq/web' + require 'sidekiq/cron/web' + mount Sidekiq::Web => '/sidekiq' # , constraints: lambda { |request| User::is_admin_from_request(request) } - mount ActionCable.server => '/cable' + apipie end diff --git a/config/schedule.yml b/config/schedule.yml new file mode 100644 index 000000000..79dbdefc9 --- /dev/null +++ b/config/schedule.yml @@ -0,0 +1,3 @@ +auto_archive_procedure: + cron: "* * * * *" + class: "AutoArchiveProcedureWorker" diff --git a/config/sidekiq.yml b/config/sidekiq.yml new file mode 100644 index 000000000..9431fe006 --- /dev/null +++ b/config/sidekiq.yml @@ -0,0 +1,7 @@ +:concurrency: 5 +staging: + :concurrency: 2 +production: + :concurrency: 2 +:queues: + - default \ No newline at end of file diff --git a/spec/workers/auto_archive_procedure_worker_spec.rb b/spec/workers/auto_archive_procedure_worker_spec.rb new file mode 100644 index 000000000..e67a19133 --- /dev/null +++ b/spec/workers/auto_archive_procedure_worker_spec.rb @@ -0,0 +1,78 @@ +require 'rails_helper' + +RSpec.describe AutoArchiveProcedureWorker, type: :worker do + + let!(:procedure) { create(:procedure, archived: false, auto_archive_on: nil )} + let!(:procedure_hier) { create(:procedure, archived: false, auto_archive_on: 1.day.ago )} + let!(:procedure_aujourdhui) { create(:procedure, archived: false, auto_archive_on: Date.today )} + let!(:procedure_demain) { create(:procedure, archived: false, auto_archive_on: 1.day.from_now )} + + subject { AutoArchiveProcedureWorker.new.perform } + + context "when procedures have no auto_archive_on" do + + before do + subject + procedure.reload + end + + it { expect(procedure.archived).to eq false } + + end + + context "when procedures have auto_archive_on set on yesterday or today" do + + describe "titi" do + before do + subject + procedure_hier.reload + procedure_aujourdhui.reload + end + + it { expect(procedure_hier.archived).to eq true } + it { expect(procedure_aujourdhui.archived).to eq true } + + end + + + context "with dossiers" do + + let!(:dossier1) { create(:dossier, procedure: procedure_hier, state: 'draft', archived: false)} + let!(:dossier2) { create(:dossier, procedure: procedure_hier, state: 'initiated', archived: false)} + let!(:dossier3) { create(:dossier, procedure: procedure_hier, state: 'replied', archived: false)} + let!(:dossier4) { create(:dossier, procedure: procedure_hier, state: 'updated', archived: false)} + let!(:dossier5) { create(:dossier, procedure: procedure_hier, state: 'received', archived: false)} + let!(:dossier6) { create(:dossier, procedure: procedure_hier, state: 'closed', archived: false)} + let!(:dossier7) { create(:dossier, procedure: procedure_hier, state: 'refused', archived: false)} + let!(:dossier8) { create(:dossier, procedure: procedure_hier, state: 'without_continuation', archived: false)} + + before do + subject + (1..8).each do |i| + eval "dossier#{i}.reload" + end + end + + it { expect(dossier1.state).to eq 'draft' } + it { expect(dossier2.state).to eq 'received' } + it { expect(dossier3.state).to eq 'received' } + it { expect(dossier4.state).to eq 'received' } + it { expect(dossier5.state).to eq 'received' } + it { expect(dossier6.state).to eq 'closed' } + it { expect(dossier7.state).to eq 'refused' } + it { expect(dossier8.state).to eq 'without_continuation' } + + end + end + + context "when procedures have auto_archive_on set on future" do + + before do + subject + end + + it { expect(procedure_demain.archived).to eq false } + + end + +end From 700372231d1eccd4045cff28bc17dca07e41fe9b Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 14:40:37 +0100 Subject: [PATCH 3/9] Sidekiq route behind superadmin authentication --- config/routes.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index fb40e341b..922131897 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,9 +42,13 @@ Rails.application.routes.draw do get 'admin' => 'admin#index' get 'backoffice' => 'backoffice#index' - resources :administrations, only: [:index, :create] - namespace :administrations do - resources :stats, only: [:index] + authenticate :administration do + resources :administrations, only: [:index, :create] + namespace :administrations do + resources :stats, only: [:index] + + mount Sidekiq::Web => '/sidekiq' + end end namespace :france_connect do @@ -209,7 +213,6 @@ Rails.application.routes.draw do require 'sidekiq/web' require 'sidekiq/cron/web' - mount Sidekiq::Web => '/sidekiq' # , constraints: lambda { |request| User::is_admin_from_request(request) } apipie end From 6f9edbd36ca4634205627682ce465bc5827d8640 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 15:09:43 +0100 Subject: [PATCH 4/9] Fix routes.rb require order --- Gemfile | 8 +++++--- Gemfile.lock | 20 ++++++++++---------- config/routes.rb | 5 ++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index b7f030edc..bb8cc7dfd 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'newrelic_rpm' gem 'sidekiq' gem 'sidekiq-cron', '~> 0.4.4' -gem 'sinatra', github: 'sinatra', require: false +gem 'sinatra', git: 'https://github.com/sinatra/sinatra.git', require: false group :test do gem 'capybara' @@ -130,7 +130,6 @@ group :development do gem 'web-console' gem 'rack-handlers' gem 'xray-rails' - gem 'scenic' end group :development, :test do @@ -161,6 +160,9 @@ group :development, :test do end group :production, :staging do - gem 'scenic' gem 'sentry-raven' end + +group :production, :staging, :development do + gem 'scenic' +end diff --git a/Gemfile.lock b/Gemfile.lock index facff428a..e13984e7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,14 @@ GIT - remote: git://github.com/sinatra/sinatra.git + remote: https://github.com/mina-deploy/mina.git + revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a + ref: 343a7 + specs: + mina (0.3.8) + open4 (~> 1.3.4) + rake + +GIT + remote: https://github.com/sinatra/sinatra.git revision: d0c4053fd459be9f2c207cfeec5c0606461c014b specs: rack-protection (2.0.0.rc1) @@ -10,15 +19,6 @@ GIT rack-protection (= 2.0.0.rc1) tilt (~> 2.0) -GIT - remote: https://github.com/mina-deploy/mina.git - revision: 343a7ab672d8b4f0ddb84ec240cde7d94b46397a - ref: 343a7 - specs: - mina (0.3.8) - open4 (~> 1.3.4) - rake - GEM remote: https://rubygems.org/ specs: diff --git a/config/routes.rb b/config/routes.rb index 922131897..5811b4890 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -47,6 +47,8 @@ Rails.application.routes.draw do namespace :administrations do resources :stats, only: [:index] + require 'sidekiq/web' + require 'sidekiq/cron/web' mount Sidekiq::Web => '/sidekiq' end end @@ -211,8 +213,5 @@ Rails.application.routes.draw do get '/:procedure_path' => '/users/dossiers#commencer' end - require 'sidekiq/web' - require 'sidekiq/cron/web' - apipie end From 4d323497e73106099cbf0d4a253bbbcce50234c0 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 15:16:00 +0100 Subject: [PATCH 5/9] Remove puts --- app/controllers/admin/procedures_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index 26147a6b4..639c79242 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -80,8 +80,6 @@ class Admin::ProceduresController < AdminController return render 'edit' end - puts procedure_params - flash.notice = 'Procédure modifiée' redirect_to edit_admin_procedure_path(id: @procedure.id) end From 237d4bdc28f886aaee52054cd8fb08ab52ecfb26 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 15:22:29 +0100 Subject: [PATCH 6/9] Auto archive option is available even if procedure is published --- .../admin/procedures/_informations.html.haml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 914e51f83..8dcff5ddc 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -80,15 +80,16 @@ %label = f.check_box :individual_with_siret Donner la possibilité de renseigner un SIRET au cours de la construction du dossier. - .col-md-6 - %h4 Options avancées +.row + .col-md-6 + %h4 Options avancées - %label{ for: :auto_archive_on} Archivage automatique le - = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-format' => 'dd/mm/yyyy' } - (à 00h00 ) - %p.help-block - %i.fa.fa-info-circle - L'archivage automatique de la procédure entrainera le passage en instruction de tous les dossiers en construction. + %label{ for: :auto_archive_on} Archivage automatique le + = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-format' => 'dd/mm/yyyy' } + (à 00h00 ) + %p.help-block + %i.fa.fa-info-circle + L'archivage automatique de la procédure entrainera le passage en instruction de tous les dossiers en construction. From a87b54b168117dada1affea34e6463346c4fc8e6 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 15 Mar 2017 15:28:09 +0100 Subject: [PATCH 7/9] Typo --- app/views/admin/procedures/_informations.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 8dcff5ddc..c379ac924 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -86,7 +86,7 @@ %label{ for: :auto_archive_on} Archivage automatique le = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-format' => 'dd/mm/yyyy' } - (à 00h00 ) + (à 00h00) %p.help-block %i.fa.fa-info-circle L'archivage automatique de la procédure entrainera le passage en instruction de tous les dossiers en construction. From a72a1825ca492c089e60d08f292acdb38fc29483 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Tue, 21 Mar 2017 17:58:08 +0100 Subject: [PATCH 8/9] Config: mina links Sidekiq conf --- config/deploy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/deploy.rb b/config/deploy.rb index d6aa94452..bc9960d27 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -78,6 +78,7 @@ set :shared_paths, [ "config/fog_credentials.yml", 'config/initializers/secret_token.rb', 'config/initializers/features.yml', + 'config/initializers/sidekiq.rb', "config/environments/#{rails_env}.rb", "config/initializers/token.rb", "config/initializers/urls.rb", From 6caa1713b7018fe7853bfc0c37d471784e89ecba Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 27 Mar 2017 15:47:05 +0200 Subject: [PATCH 9/9] Fix Gemfile.lock --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6c78de68c..3eb20b63b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -699,7 +699,6 @@ DEPENDENCIES sidekiq sidekiq-cron (~> 0.4.4) simple_form - simplecov sinatra! smart_listing spreadsheet_architect