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

39 lines
1.2 KiB
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
2023-07-09 09:48:07 +05:30
Settings['shared'] ||= {}
--- 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!
--- a/config/initializers_before_autoloader/001_fast_gettext.rb
+++ b/config/initializers_before_autoloader/001_fast_gettext.rb
2023-05-28 00:09:46 +05:30
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative '../../lib/gitlab/i18n'
-require_relative '../../lib/gitlab/i18n/pluralization'
+require '/usr/share/gitlab/lib/gitlab/i18n'
+require '/usr/share/gitlab/lib/gitlab/i18n/pluralization'
Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en)