Commit 2d65430cd7b2cf3795f922f70ec1b63f12affed6
Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable
Showing
3 changed files
with
4 additions
and
3 deletions
Show diff stats
VERSION
lib/api/helpers.rb
| 1 | module API | 1 | module API |
| 2 | module APIHelpers | 2 | module APIHelpers |
| 3 | def current_user | 3 | def current_user |
| 4 | - @current_user ||= User.find_by_authentication_token(params[:private_token] || env["HTTP_PRIVATE_TOKEN"]) | 4 | + private_token = (params[:private_token] || env["HTTP_PRIVATE_TOKEN"]).to_s |
| 5 | + @current_user ||= User.find_by_authentication_token(private_token) | ||
| 5 | end | 6 | end |
| 6 | 7 | ||
| 7 | def user_project | 8 | def user_project |
lib/tasks/gitlab/check.rake
| @@ -657,7 +657,7 @@ namespace :gitlab do | @@ -657,7 +657,7 @@ namespace :gitlab do | ||
| 657 | end | 657 | end |
| 658 | 658 | ||
| 659 | def check_gitlab_shell | 659 | def check_gitlab_shell |
| 660 | - required_version = Gitlab::VersionInfo.new(1, 7, 4) | 660 | + required_version = Gitlab::VersionInfo.new(1, 7, 8) |
| 661 | current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) | 661 | current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) |
| 662 | 662 | ||
| 663 | print "GitLab Shell version >= #{required_version} ? ... " | 663 | print "GitLab Shell version >= #{required_version} ? ... " |