From 2099578f590c58725d2feb9f064d120ab8b4e068 Mon Sep 17 00:00:00 2001 From: mortyccp Date: Thu, 3 Jan 2019 19:27:00 +0800 Subject: Revert changes --- lib/gitlab/auth.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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? -- cgit v1.2.3