Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormortyccp <mortyccp@gmail.com>2019-01-03 14:27:00 +0300
committermortyccp <mortyccp@gmail.com>2019-01-03 15:28:02 +0300
commit2099578f590c58725d2feb9f064d120ab8b4e068 (patch)
treebc35aa1846f7fa581b088f6641b97203a6dbc3d8
parent0e061adfcb880c3eac58630400c0cf647f247bd3 (diff)
Revert changes
-rw-r--r--lib/gitlab/auth.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index fa3399b64f5..7aa02009aa0 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -169,7 +169,6 @@ module Gitlab
AccessTokenValidationService.new(token).include_any_scope?(scopes)
end
- # rubocop: disable CodeReuse/ActiveRecord
def abilities_for_scopes(scopes)
abilities_by_scope = {
api: full_authentication_abilities,
@@ -182,6 +181,7 @@ module Gitlab
end.uniq
end
+ # rubocop: disable CodeReuse/ActiveRecord
def deploy_token_check(login, password)
return unless password.present?