Commit 4d6e9ee5 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve conflicts

parent f5361364
......@@ -657,13 +657,6 @@ a.deploy-project-label {
margin-bottom: 0;
}
<<<<<<< HEAD
.import-btn-container {
margin-bottom: 0;
}
=======
>>>>>>> upstream/master
.toggle-import-form {
padding-bottom: 10px;
}
......
......@@ -126,7 +126,6 @@ module API
Gitlab::RequestForgeryProtection.verified?(env)
end
<<<<<<< HEAD
def find_user_by_job_token
return @user_by_job_token if defined?(@user_by_job_token)
......@@ -148,13 +147,12 @@ module API
def find_user_by_authentication_token(token_string)
User.find_by_authentication_token(token_string)
end
=======
def find_oauth_access_token
return @oauth_access_token if defined?(@oauth_access_token)
token = Doorkeeper::OAuth::Token.from_request(doorkeeper_request, *Doorkeeper.configuration.access_token_methods)
return @oauth_access_token = nil unless token
>>>>>>> upstream/master
@oauth_access_token = OauthAccessToken.by_token(token)
raise UnauthorizedError unless @oauth_access_token
......
......@@ -397,7 +397,6 @@ module API
private
<<<<<<< HEAD
def private_token
params[APIGuard::PRIVATE_TOKEN_PARAM] || env[APIGuard::PRIVATE_TOKEN_HEADER]
end
......@@ -420,8 +419,6 @@ module API
warden.try(:authenticate) if verified_request?
end
=======
>>>>>>> upstream/master
def initial_current_user
return @initial_current_user if defined?(@initial_current_user)
......@@ -432,7 +429,6 @@ module API
end
end
<<<<<<< HEAD
def find_current_user
user =
find_user_by_private_token(scopes: scopes_registered_for_endpoint) ||
......@@ -447,8 +443,6 @@ module API
user
end
=======
>>>>>>> upstream/master
def sudo!
return unless sudo_identifier
return unless initial_current_user
......
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