diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-23 16:12:19 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-23 16:12:19 +0200 |
| commit | 2afe3a1210e6c444f9b92d59a02fcb3f474ae614 (patch) | |
| tree | 86034702043da254a0ad757e427f5c192e60750f /config/initializers | |
| parent | 5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e (diff) | |
| download | gitlab-ce-2afe3a1210e6c444f9b92d59a02fcb3f474ae614.tar.gz | |
Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/initializers/2_app.rb | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 53e3c50df5f..9b00ae459a3 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,5 +1,4 @@ require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible -require_dependency File.expand_path('../../lib/settings', __dir__) # Load Settings as soon as possible # Default settings Settings['ldap'] ||= Settingslogic.new({}) diff --git a/config/initializers/2_app.rb b/config/initializers/2_app.rb deleted file mode 100644 index a560e9d0471..00000000000 --- a/config/initializers/2_app.rb +++ /dev/null @@ -1,9 +0,0 @@ -require_dependency 'gitlab/popen' - -module Gitlab - def self.config - Settings - end - - REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze -end |