summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-02-09 18:08:33 +0100
committerBrett Walker <bwalker@gitlab.com>2018-02-09 18:08:33 +0100
commit54d88e06907f6ce6620c23b6d80c2fd1131004d5 (patch)
tree8be48dfd3ff7ad20be5be890ca5edbc3f6b115cf /config
parentf7c662c733a2a24c044c1f0bad03cfc63f704258 (diff)
downloadgitlab-ce-bw-fix-autoload-issue.tar.gz
make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issue
This fixes an issue where the Rails autoload system would throw various `Unable to autoload constant` errors (such as `Unable to autoload constant EE::ProjectsHelper`) when using the autoload system (such with `spring` or `reload!` in the rails console. This error was specifically ocurring in the EE code, however, it's seems reasonable to place the fix in CE as a general innoculation.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
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