diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2015-02-16 15:16:26 +0300 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-16 22:46:06 +0300 |
commit | ed3298fc019d224b9048901972ac03e5272a3b25 (patch) | |
tree | bbdaea24522778869f106fdfe99f691feb8ccbc7 /lib/api | |
parent | 35729671fb3a123ddeb7b2b1cda446fd661bd4e6 (diff) |
Allow to configure gitlab_shell_secret location
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 85e9081680d..1ebf9a1f022 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -243,7 +243,7 @@ module API end def secret_token - File.read(Rails.root.join('.gitlab_shell_secret')).chomp + File.read(Gitlab.config.gitlab_shell.secret_file).chomp end def handle_member_errors(errors) |