summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-07 11:01:21 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-07 11:01:21 +0000
commit546b18b90317c0c9c0163ddcc5c54798a0bed841 (patch)
treeff10c1965e629113b25be892a72c0f181f1b8671 /config
parent3cb798357fbfb8b3230b60130fc1c6b328ae84b7 (diff)
parentd13669716ab0c31ce9039ae9f7f073e33a4dc40f (diff)
downloadgitlab-ce-546b18b90317c0c9c0163ddcc5c54798a0bed841.tar.gz
Merge branch 'tc-geo-read-only-idea' into 'master'
Create idea of read-only database Closes #37534 See merge request gitlab-org/gitlab-ce!14688
Diffstat (limited to 'config')
-rw-r--r--config/application.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index ca2ab83becc..31e91835b9e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -154,6 +154,9 @@ module Gitlab
ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
ENV['GIT_TERMINAL_PROMPT'] = '0'
+ # Gitlab Read-only middleware support
+ config.middleware.insert_after ActionDispatch::Flash, 'Gitlab::Middleware::ReadOnly'
+
config.generators do |g|
g.factory_girl false
end