Fix relative path for config/gitlab.yml and lib/gitlab

This commit is contained in:
Pirate Praveen 2018-10-17 19:59:37 +05:30
parent 81dbd85cb2
commit 1fa195819c
2 changed files with 17 additions and 0 deletions

View file

@ -0,0 +1,16 @@
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -1,7 +1,7 @@
require 'settingslogic'
class Settings < Settingslogic
- source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
+ source ENV.fetch('GITLAB_CONFIG') { Pathname.new('/usr/share/gitlab/config/gitlab.yml') }
namespace ENV.fetch('GITLAB_ENV') { Rails.env }
class << self
--- a/config/initializers/2_gitlab.rb
+++ b/config/initializers/2_gitlab.rb
@@ -1 +1 @@
-require_relative '../../lib/gitlab'
+require '/usr/share/gitlab/lib/gitlab'

View file

@ -22,3 +22,4 @@
0630-fix-mail-room-path.patch
0640-relax-ruby-version.patch
0650-fix-8-to-10-migration.patch
0660-fix-gitlab-yml-path.patch