aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2015-06-09 15:33:40 +0200
committerLuc Donnet2015-06-09 15:34:00 +0200
commit08bc55c292373a1cc875d8a078520caf9e116de0 (patch)
tree5dcc0fdb18449e469f529dac7737e08ded98e7bd
parentf9170e9480cf3a0c3474b54820ea4a5585104cb5 (diff)
downloadchouette-core-08bc55c292373a1cc875d8a078520caf9e116de0.tar.bz2
Set devise asynchronous mail to false by default
-rw-r--r--config/deploy.rb1
-rw-r--r--config/deploy/unstable.rb2
-rw-r--r--config/initializers/devise_async.rb2
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