Commit bc4efd18 authored by Etienne Baqué's avatar Etienne Baqué Committed by Stan Hu

Removed rubocop disable flags, updated changelog

parent 64e24d64
--- ---
title: Encrypt existing deploy tokens and new ones when storing them title: Encrypt existing and new deploy tokens
merge_request: 30679 merge_request: 30679
author: author:
type: security type: other
...@@ -198,7 +198,6 @@ module Gitlab ...@@ -198,7 +198,6 @@ module Gitlab
end.uniq end.uniq
end end
# rubocop: disable CodeReuse/ActiveRecord
def deploy_token_check(login, password) def deploy_token_check(login, password)
return unless password.present? return unless password.present?
...@@ -213,7 +212,6 @@ module Gitlab ...@@ -213,7 +212,6 @@ module Gitlab
Gitlab::Auth::Result.new(token, token.project, :deploy_token, scopes) Gitlab::Auth::Result.new(token, token.project, :deploy_token, scopes)
end end
end end
# rubocop: enable CodeReuse/ActiveRecord
def lfs_token_check(login, encoded_token, project) def lfs_token_check(login, encoded_token, project)
deploy_key_matches = login.match(/\Alfs\+deploy-key-(\d+)\z/) deploy_key_matches = login.match(/\Alfs\+deploy-key-(\d+)\z/)
......
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