2019-10-04 23:26:41 +05:30
|
|
|
--- a/config/initializers/1_settings.rb
|
|
|
|
|
+++ b/config/initializers/1_settings.rb
|
2019-12-04 21:09:36 +05:30
|
|
|
@@ -1,6 +1,6 @@
|
2019-10-04 23:26:41 +05:30
|
|
|
-require_relative '../settings'
|
|
|
|
|
-require_relative '../object_store_settings'
|
2019-12-04 21:09:36 +05:30
|
|
|
-require_relative '../smime_signature_settings'
|
2019-10-04 23:26:41 +05:30
|
|
|
+require '/usr/share/gitlab/config/settings'
|
|
|
|
|
+require '/usr/share/gitlab/config/object_store_settings'
|
2019-12-04 21:09:36 +05:30
|
|
|
+require '/usr/share/gitlab/config/smime_signature_settings'
|
2019-10-04 23:26:41 +05:30
|
|
|
|
|
|
|
|
# Default settings
|
|
|
|
|
Settings['ldap'] ||= Settingslogic.new({})
|
|
|
|
|
--- a/config/environment.rb
|
|
|
|
|
+++ b/config/environment.rb
|
2020-03-12 18:50:15 +05:30
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
# Load the Rails application.
|
2019-10-04 23:26:41 +05:30
|
|
|
-require_relative 'application'
|
|
|
|
|
+require '/usr/share/gitlab/config/application'
|
|
|
|
|
|
2020-03-12 18:50:15 +05:30
|
|
|
# Initialize the Rails application.
|
2019-10-04 23:26:41 +05:30
|
|
|
Rails.application.initialize!
|
2019-10-05 00:19:09 +05:30
|
|
|
--- a/config/settings.rb
|
|
|
|
|
+++ b/config/settings.rb
|
2019-10-12 22:33:52 +05:30
|
|
|
@@ -5,7 +5,7 @@
|
2019-10-05 00:19:09 +05:30
|
|
|
# full Rails environment being loaded. We can not use `require_relative` either,
|
|
|
|
|
# as Rails uses `load` for `require_dependency` (used when loading the Rails
|
|
|
|
|
# environment). This could then lead to this file being loaded twice.
|
|
|
|
|
-require_dependency File.expand_path('../lib/gitlab', __dir__)
|
|
|
|
|
+require ('/usr/share/gitlab/lib/gitlab')
|
|
|
|
|
|
|
|
|
|
class Settings < Settingslogic
|
|
|
|
|
source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('gitlab.yml', __dir__)) }
|
