5.4.1 5.4.2
module API module API
module APIHelpers module APIHelpers
def current_user 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 end
def user_project def user_project
... ...
......
...@@ -657,7 +657,7 @@ namespace :gitlab do ...@@ -657,7 +657,7 @@ namespace :gitlab do
end end
def check_gitlab_shell 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) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... " print "GitLab Shell version >= #{required_version} ? ... "
... ...
......