diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-12 14:02:10 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-12 14:02:10 +0000 |
| commit | 037c664dc1865c96fbf365378a6272571c2ef324 (patch) | |
| tree | d184198a3f6ffb9538185714994d1a6f2f930122 | |
| parent | 7611ec4eef7d543b9e32894a015c5b0a4c5caeec (diff) | |
| parent | 54d88e06907f6ce6620c23b6d80c2fd1131004d5 (diff) | |
| download | gitlab-ce-037c664dc1865c96fbf365378a6272571c2ef324.tar.gz | |
Merge branch 'bw-fix-autoload-issue' into 'master'
Fix issue with Gitlab::CurrentSettings and autoload/spring system
Closes gitlab-ee#4842
See merge request gitlab-org/gitlab-ce!17037
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 751307de975..9eb6cf4b824 100644 --- a/config/application.rb +++ b/config/application.rb @@ -11,6 +11,7 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/redis/queues') require_dependency Rails.root.join('lib/gitlab/redis/shared_state') require_dependency Rails.root.join('lib/gitlab/request_context') + require_dependency Rails.root.join('lib/gitlab/current_settings') # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers |