Fix relative path in config/initializers
This commit is contained in:
parent
c83ddacfc7
commit
7def25d4d1
2 changed files with 21 additions and 0 deletions
20
debian/patches/0750-fix-relative-paths.patch
vendored
Normal file
20
debian/patches/0750-fix-relative-paths.patch
vendored
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- 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!
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -24,3 +24,4 @@
|
||||||
0710-use-yarnpkg.patch
|
0710-use-yarnpkg.patch
|
||||||
0730-install-graphql-tag.patch
|
0730-install-graphql-tag.patch
|
||||||
0740-use-packaged-modules.patch
|
0740-use-packaged-modules.patch
|
||||||
|
0750-fix-relative-paths.patch
|
||||||
|
|
Loading…
Reference in a new issue