diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 14:56:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 14:56:00 +0300 |
| commit | f12386aa9acf19877161bfc77e55572f40509cc4 (patch) | |
| tree | c54e5216f4a7a71fb446e7c3708cb6941a291ce2 /app/models | |
| parent | b64b61bfe72c54fe4a7fdce34b2f1591e3822e5e (diff) | |
Add latest changes from gitlab-org/security/gitlab@15-5-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 950e0a583bc..cc5ba41191b 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -1338,7 +1338,9 @@ module Ci end def reset_source_bridge!(current_user) + # break recursion when no source_pipeline bridge (first upstream pipeline) return unless bridge_waiting? + return unless current_user.can?(:update_pipeline, source_bridge.pipeline) source_bridge.pending! Ci::AfterRequeueJobService.new(project, current_user).execute(source_bridge) # rubocop:disable CodeReuse/ServiceClass |