diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 11:20:51 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 11:20:51 +0100 |
| commit | 2955ca613bfe13cd15c43d082be934075636ae0e (patch) | |
| tree | 4c367f600ff0b7f273c3b4194e97060141b54b02 /config/application.rb | |
| parent | e1e67d383e4b56c9e1848aebc175402a71502e82 (diff) | |
| parent | 09e712c0fb721059e4b2619eb9fc104257fc492d (diff) | |
| download | gitlab-ce-2955ca613bfe13cd15c43d082be934075636ae0e.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
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 |