summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-26 12:12:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-26 12:12:49 +0000
commit5343536f2bb402bc767db2d015e45ac87189d7c3 (patch)
tree29e7630ace5f465f0b3d6374c044dbb57227d694 /app/finders
parentbc8f298b647859a411d38a440c397e5990ef4941 (diff)
downloadgitlab-ce-5343536f2bb402bc767db2d015e45ac87189d7c3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/ci/auth_job_finder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/ci/auth_job_finder.rb b/app/finders/ci/auth_job_finder.rb
index d207a522aa8..2dbdcb3c472 100644
--- a/app/finders/ci/auth_job_finder.rb
+++ b/app/finders/ci/auth_job_finder.rb
@@ -16,7 +16,7 @@ module Ci
validate_job!(job)
- if job.user && Feature.enabled?(:ci_scoped_job_token, job.project, default_enabled: :yaml)
+ if job.user
job.user.set_ci_job_token_scope!(job)
end
end