diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-14 15:39:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-14 15:39:15 +0000 |
| commit | 2d65430cd7b2cf3795f922f70ec1b63f12affed6 (patch) | |
| tree | 71a3ab2a3229a81f5894eaf92286eeab96748f55 | |
| parent | 36dc6e6b510625708836d0d1d6faf17527446e15 (diff) | |
| parent | 671cdc5c5fbb67cfe30cdf580c07ec5b5d46253f (diff) | |
| download | gitlab-ce-5.4.2.tar.gz | |
Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stablev5.4.2
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/api/helpers.rb | 3 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -1 +1 @@ -5.4.1 +5.4.2 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 diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 1dc538ddc83..85db3eaf033 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -657,7 +657,7 @@ namespace :gitlab do end def check_gitlab_shell - required_version = Gitlab::VersionInfo.new(1, 7, 4) + required_version = Gitlab::VersionInfo.new(1, 7, 8) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) print "GitLab Shell version >= #{required_version} ? ... " |