--- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,5 +1,5 @@ -require_relative '../settings' -require_relative '../object_store_settings' +require '/usr/share/gitlab/config/settings' +require '/usr/share/gitlab/config/object_store_settings' # Default settings Settings['ldap'] ||= Settingslogic.new({}) --- a/config/environment.rb +++ b/config/environment.rb @@ -1,6 +1,6 @@ # Load the rails application -require_relative 'application' +require '/usr/share/gitlab/config/application' # Initialize the rails application Rails.application.initialize! --- a/config/settings.rb +++ b/config/settings.rb @@ -5,7 +5,7 @@ # 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__)) }