From a3601d6005ff4a5f109444e7ab5333d0c229d3ed Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 9 Apr 2015 12:21:59 -0400 Subject: Revert "Preload lib/" This reverts commit 5511a731bcc05034abacd4ec01ff7d5a2a3b89d3. --- config/initializers/2_app.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'config') diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb index 655590dff0b..688cdf5f4b0 100644 --- a/config/initializers/2_app.rb +++ b/config/initializers/2_app.rb @@ -6,8 +6,3 @@ module Gitlab Settings end end - -# -# Load all libs for threadsafety -# -Dir["#{Rails.root}/lib/**/*.rb"].each { |file| require file } -- cgit v1.2.1 From 91c39fd8c70e45aeb2d39f4f2b08164d01300b89 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 9 Apr 2015 13:56:38 -0400 Subject: Add lib/gitlab.rb to autoload non-conventional paths --- config/initializers/1_settings.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index de79595d031..e6b00c531ac 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,3 +1,5 @@ +require 'gitlab' # Load lib/gitlab.rb as soon as possible + class Settings < Settingslogic source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" } namespace Rails.env -- cgit v1.2.1