From 1a115cecb453f3dca65d9f69c87dca28595cd75a Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Nov 2013 13:20:49 +0100 Subject: Make sure private_token for API is a string --- lib/api/helpers.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From aa81c100401924300b21260d3315e8d94d1bce85 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Nov 2013 13:21:25 +0100 Subject: Bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ade65226e0a..8ae03c11904 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.4.1 +5.4.2 -- cgit v1.2.1 From 671cdc5c5fbb67cfe30cdf580c07ec5b5d46253f Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Nov 2013 13:59:41 +0100 Subject: Use gitlab-shell 1.7.8 --- lib/tasks/gitlab/check.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} ? ... " -- cgit v1.2.1