From bc4efd18a06e0b31a30b8e63828506ad647b2d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Etienne=20Baqu=C3=A9?= Date: Fri, 19 Jul 2019 15:16:07 -0400 Subject: Removed rubocop disable flags, updated changelog --- changelogs/unreleased/63502-encrypt-deploy-token.yml | 4 ++-- 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/) -- cgit v1.2.1