diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-24 11:02:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-24 11:02:25 +0000 |
| commit | 499d875652610dd1e1f02bff67c7544672850ff8 (patch) | |
| tree | ec6cc72fc0921bef9d1148f6bdc0bd014b7d3658 /lib | |
| parent | 770b2f5171e6e44a79b6a2f0cc60672909ce351d (diff) | |
| parent | 6cb65c8c344e733902d7193facc71cdc8ce569c7 (diff) | |
| download | gitlab-ce-499d875652610dd1e1f02bff67c7544672850ff8.tar.gz | |
Merge branch 'workhorse-secret-path' into 'master'
Make location of gitlab_workhorse_secret configurable
See merge request !10357
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index e6e40f6945d..c551f939df1 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -168,7 +168,7 @@ module Gitlab end def secret_path - Rails.root.join('.gitlab_workhorse_secret') + Gitlab.config.workhorse.secret_file end def set_key_and_notify(key, value, expire: nil, overwrite: true) |