diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-11-14 13:20:49 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-11-14 13:20:49 +0100 |
commit | 1a115cecb453f3dca65d9f69c87dca28595cd75a (patch) | |
tree | 918520a1f969d2b60cf7bf3bb32106bfe7834cbe | |
parent | 36dc6e6b510625708836d0d1d6faf17527446e15 (diff) | |
download | gitlab-ce-1a115cecb453f3dca65d9f69c87dca28595cd75a.tar.gz |
Make sure private_token for API is a string
-rw-r--r-- | lib/api/helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index f857d4133b2..c99264da550 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -1,7 +1,8 @@ module API module APIHelpers def current_user - @current_user ||= User.find_by_authentication_token(params[:private_token] || env["HTTP_PRIVATE_TOKEN"]) + private_token = (params[:private_token] || env["HTTP_PRIVATE_TOKEN"]).to_s + @current_user ||= User.find_by_authentication_token(private_token) end def user_project |