Improve patch as per upstream suggestion

This commit is contained in:
Pirate Praveen 2018-10-18 13:07:43 +05:30
parent 1fa195819c
commit 9cbefd80a6

View file

@ -5,7 +5,7 @@
class Settings < 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('..', __dir__)).join('config/gitlab.yml') }
+ source ENV.fetch('GITLAB_CONFIG') { Pathname.new('/usr/share/gitlab/config/gitlab.yml') } + source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('gitlab.yml', __dir__)) }
namespace ENV.fetch('GITLAB_ENV') { Rails.env } namespace ENV.fetch('GITLAB_ENV') { Rails.env }
class << self class << self