diff options
| author | Etienne Baqué <ebaque@gitlab.com> | 2019-07-19 15:16:07 -0400 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-26 19:39:49 -0700 |
| commit | bc4efd18a06e0b31a30b8e63828506ad647b2d8e (patch) | |
| tree | a9b0dc1c3b45c8b462fb09488c38f5e21892168f | |
| parent | 64e24d6492f39a4ab7f2202897755afd1704f147 (diff) | |
| download | gitlab-ce-bc4efd18a06e0b31a30b8e63828506ad647b2d8e.tar.gz | |
Removed rubocop disable flags, updated changelog
| -rw-r--r-- | changelogs/unreleased/63502-encrypt-deploy-token.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/auth.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/changelogs/unreleased/63502-encrypt-deploy-token.yml b/changelogs/unreleased/63502-encrypt-deploy-token.yml index 249f52014cd..81ce1e6c3dd 100644 --- a/changelogs/unreleased/63502-encrypt-deploy-token.yml +++ b/changelogs/unreleased/63502-encrypt-deploy-token.yml @@ -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 diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index fe40d553b2f..6769bd95c2b 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -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/) |