21 lines
595 B
Diff
21 lines
595 B
Diff
|
--- 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!
|