Commit 2d65430c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets 🌴

Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable

parents 36dc6e6b 671cdc5c
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
......
......@@ -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} ? ... "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment