diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/services/ci/job_artifacts/create_service.rb | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/services/ci/job_artifacts/create_service.rb')
-rw-r--r-- | app/services/ci/job_artifacts/create_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/ci/job_artifacts/create_service.rb b/app/services/ci/job_artifacts/create_service.rb index 3dc097a8603..ee9982cf3ab 100644 --- a/app/services/ci/job_artifacts/create_service.rb +++ b/app/services/ci/job_artifacts/create_service.rb @@ -16,7 +16,7 @@ module Ci def initialize(job) @job = job @project = job.project - @pipeline = job.pipeline if ::Feature.enabled?(:ci_update_unlocked_job_artifacts, @project) + @pipeline = job.pipeline end def authorize(artifact_type:, filesize: nil) @@ -85,7 +85,7 @@ module Ci expire_in: expire_in } - artifact_attributes[:locked] = pipeline.locked if ::Feature.enabled?(:ci_update_unlocked_job_artifacts, project) + artifact_attributes[:locked] = pipeline.locked artifact = Ci::JobArtifact.new( artifact_attributes.merge( |