Removed rubocop disable flags, updated changelog

This commit is contained in:
Etienne Baqué 2019-07-19 15:16:07 -04:00 committed by Stan Hu
parent 64e24d6492
commit bc4efd18a0
2 changed files with 2 additions and 4 deletions

View File

@ -1,5 +1,5 @@
---
title: Encrypt existing deploy tokens and new ones when storing them
title: Encrypt existing and new deploy tokens
merge_request: 30679
author:
type: security
type: other

View File

@ -198,7 +198,6 @@ module Gitlab
end.uniq
end
# rubocop: disable CodeReuse/ActiveRecord
def deploy_token_check(login, password)
return unless password.present?
@ -213,7 +212,6 @@ module Gitlab
Gitlab::Auth::Result.new(token, token.project, :deploy_token, scopes)
end
end
# rubocop: enable CodeReuse/ActiveRecord
def lfs_token_check(login, encoded_token, project)
deploy_key_matches = login.match(/\Alfs\+deploy-key-(\d+)\z/)