summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-11-26 15:48:01 +0200
committerValery Sizov <valery@gitlab.com>2015-11-26 17:03:43 +0200
commit7f214cee74796ceaf7b01bd6e133d4d54c5123db (patch)
treecefc7a17adadbee1a9d349f4f5843d63290482a7 /config/application.rb
parent3e0fe27627f5b074a35ce2e1a0794f869f8abc15 (diff)
downloadgitlab-ce-7f214cee74796ceaf7b01bd6e133d4d54c5123db.tar.gz
Migrate mailers to ActiveJob
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index bfa2a809dd7..d255ff0719f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -99,6 +99,10 @@ module Gitlab
redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
config.cache_store = :redis_store, redis_config_hash
+ config.active_record.raise_in_transactional_callbacks = true
+
+ config.active_job.queue_adapter = :sidekiq
+
# This is needed for gitlab-shell
ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
end