debian-mirror-gitlab/debian/patches/0660-fix-gitlab-yml-path.patch
2018-10-18 13:25:25 +05:30

16 lines
568 B
Diff

--- 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(File.expand_path('gitlab.yml', __dir__)) }
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'