diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-25 20:45:29 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-25 22:26:29 -0700 |
| commit | a0b33b348bc243a8e490a4098b6875bdfcbc8c3f (patch) | |
| tree | 754d29bda926583dcf84750bd89e48a67d55526d | |
| parent | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff) | |
| download | gitlab-ce-sh-load-workhorse-secret-env.tar.gz | |
Add environment variable to specify .gitlab_workhorse_secret filenamesh-load-workhorse-secret-env
Relates to gitlab-org/omnibus-gitlab#1661
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 92c730eaa8a..f525d32759c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Add hover to trash icon in notes !7008 (blackst0ne) - Escape ref and path for relative links !6050 (winniehell) + - Add environment variable to specify .gitlab_workhorse_secret filename - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache - Replace jquery.cookie plugin with js.cookie !7085 diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 594439a5d4b..30513a17cab 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -126,7 +126,7 @@ module Gitlab end def secret_path - Rails.root.join('.gitlab_workhorse_secret') + ENV['GITLAB_WORKHORSE_SECRET'] || File.join(Rails.root, '.gitlab_workhorse_secret') end protected |