summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-02-16 13:16:26 +0100
committerJakub Jirutka <jakub@jirutka.cz>2015-05-16 21:46:06 +0200
commited3298fc019d224b9048901972ac03e5272a3b25 (patch)
treebbdaea24522778869f106fdfe99f691feb8ccbc7 /lib
parent35729671fb3a123ddeb7b2b1cda446fd661bd4e6 (diff)
downloadgitlab-ce-ed3298fc019d224b9048901972ac03e5272a3b25.tar.gz
Allow to configure gitlab_shell_secret location
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers.rb2
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)