diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-02-12 12:48:31 -0600 |
| commit | c833a09d9156e26851746250460ddd2f091e73cd (patch) | |
| tree | 01791c2a8461b53c797b3d5b91858f98b07eb477 /config/application.rb | |
| parent | 46ae03628de47d1bef2683a3a5fe4963b3df7d52 (diff) | |
| parent | 0a22ff267b2d3d787d3da44d927caac7bd442832 (diff) | |
| download | gitlab-ce-c833a09d9156e26851746250460ddd2f091e73cd.tar.gz | |
Merge branch 'master' into jivl-update-katex
Diffstat (limited to 'config/application.rb')
| -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 fdc9296ebdd..c914e34b9c3 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 |