From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Aug 2020 18:42:06 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee

---
 lib/gitlab/auth.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/gitlab/auth.rb')

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 1a23814959d..332d0bc1478 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -26,6 +26,8 @@ module Gitlab
     # Default scopes for OAuth applications that don't define their own
     DEFAULT_SCOPES = [:api].freeze
 
+    CI_JOB_USER = 'gitlab-ci-token'
+
     class << self
       prepend_if_ee('EE::Gitlab::Auth') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
@@ -126,7 +128,7 @@ module Gitlab
       # rubocop:enable Gitlab/RailsLogger
 
       def skip_rate_limit?(login:)
-        ::Ci::Build::CI_REGISTRY_USER == login
+        CI_JOB_USER == login
       end
 
       def look_to_limit_user(actor)
@@ -257,7 +259,7 @@ module Gitlab
       end
 
       def build_access_token_check(login, password)
-        return unless login == 'gitlab-ci-token'
+        return unless login == CI_JOB_USER
         return unless password
 
         build = find_build_by_token(password)
-- 
cgit v1.2.3