debian-mirror-gitlab/debian/patches/tweaks/0060-fix-relative-paths.patch

28 lines
836 B
Diff
Raw Normal View History

2020-04-13 13:49:04 +05:30
Debian specific patch to adapt to debian policy mandated paths
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
2021-03-11 21:09:22 +05:30
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require_relative '../settings'
-require_relative '../object_store_settings'
2019-12-04 21:09:36 +05:30
-require_relative '../smime_signature_settings'
+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'
# Default settings
2021-02-22 22:40:45 +05:30
Settings['shared'] ||= Settingslogic.new({})
--- a/config/environment.rb
+++ b/config/environment.rb
2021-03-11 21:09:22 +05:30
@@ -1,7 +1,7 @@
# frozen_string_literal: true
2020-03-12 18:50:15 +05:30
# Load the Rails application.
-require_relative 'application'
+require '/usr/share/gitlab/config/application'
2020-03-12 18:50:15 +05:30
# Initialize the Rails application.
Rails.application.initialize!