diff options
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/deploy/unstable.rb | 2 | ||||
| -rw-r--r-- | config/initializers/devise_async.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 0060749c3..4e2e2d586 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -56,6 +56,7 @@ namespace :deploy do run "ln -nfs #{shared_path}/config/production.rb #{release_path}/config/environments/" run "ln -nfs #{shared_path}/config/secrets.yml #{release_path}/config/" run "ln -nfs #{shared_path}/config/newrelic.yml #{release_path}/config/" + run "ln -nfs #{shared_path}/config/devise_async.rb #{release_path}/config/initializers/" end desc "Install chouette command" diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb index cd2fa9f6e..aff60778c 100644 --- a/config/deploy/unstable.rb +++ b/config/deploy/unstable.rb @@ -1,3 +1,3 @@ server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true -set :branch, "rails4" +set :branch, "V3_0" #set :gui_cmd, "2.5.2" diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb index e111247ea..3ee0a7858 100644 --- a/config/initializers/devise_async.rb +++ b/config/initializers/devise_async.rb @@ -1,2 +1,2 @@ Devise::Async.backend = :delayed_job -Devise::Async.enabled = true # | false +Devise::Async.enabled = false # Set to true to use Delayed Job for asynchronous mail |