diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 18:40:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 18:40:49 +0000 |
| commit | 7f6b47d3138f2cff2a72035a80794df05e58e543 (patch) | |
| tree | 1f36966cfc455a52cf391244363d0e9be208fbdb | |
| parent | 496a1d765be4fbbf470b247e3f44d6cd79f05dae (diff) | |
| download | gitlab-ce-7f6b47d3138f2cff2a72035a80794df05e58e543.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-10-stable-ee
| -rw-r--r-- | spec/tooling/danger/stable_branch_spec.rb | 2 | ||||
| -rw-r--r-- | tooling/danger/stable_branch.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/tooling/danger/stable_branch_spec.rb b/spec/tooling/danger/stable_branch_spec.rb index 4d86e066c20..b6ec4ad8895 100644 --- a/spec/tooling/danger/stable_branch_spec.rb +++ b/spec/tooling/danger/stable_branch_spec.rb @@ -93,7 +93,7 @@ RSpec.describe Tooling::Danger::StableBranch, feature_category: :delivery do let(:pipeline_bridges_response) do [ { - 'name' => 'e2e:package-and-test', + 'name' => 'e2e:package-and-test-ee', 'status' => pipeline_bridge_state, 'downstream_pipeline' => { 'id' => '123', diff --git a/tooling/danger/stable_branch.rb b/tooling/danger/stable_branch.rb index 9b467146096..be668731cb4 100644 --- a/tooling/danger/stable_branch.rb +++ b/tooling/danger/stable_branch.rb @@ -110,7 +110,7 @@ module Tooling gitlab .api .pipeline_bridges(helper.mr_target_project_id, mr_head_pipeline_id) - &.find { |bridge| bridge['name'] == 'e2e:package-and-test' } + &.find { |bridge| bridge['name'].include?('package-and-test') } end def stable_target_branch |