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

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