Skip to content
Snippets Groups Projects

Fix bug in Merge When Checks Pass needing a pipeline

Merged Marc Shaw requested to merge fix_bug_in_merge_when_checks_pass into master

What does this MR do and why?

Merge When Checks Pass should function when a pipeline does not exist, and is not needed. Currently we inherit from MergeWhenPipelineSucceeds which requires a pipeline.

To test:

  • Have a project which does not use pipelines and the setting 'pipeline required to pass' is not checked
  • Ensure merge_when_checks_pass and additional_merge_when_checks_ready feature flags are on
  • Be on master
  • Create an MR that is mergeable except for an approval
  • Click Auto Merge
  • Click Approve
  • It will fail to merge
  • Switch to this branch
  • Unapprove
  • Cancel auto merge
  • Click Auto merge
  • Approve again
  • It should merge fine

Related to: #441316 (closed)

Edited by Marc Shaw

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Marc Shaw requested review from @patrickbajao

    requested review from @patrickbajao

  • A deleted user added backend typebug labels

    added backend typebug labels

  • 1 Warning
    :warning: This MR changes code in ee/, but its Changelog commit is missing the EE: true trailer. Consider adding it to your Changelog commits.

    Reviewer roulette

    Category Reviewer Maintainer
    backend @mc_rocha profile link current availability (UTC-5, 14 hours behind author) @j.seto profile link current availability (UTC+0, 9 hours behind author)
    test for spec/features/* @mc_rocha profile link current availability (UTC-5, 14 hours behind author) Maintainer review is optional for test for spec/features/*

    Please check reviewer's status!

    • available Reviewer is available!
    • unavailable Reviewer is unavailable!

    Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.

    If needed, you can retry the :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

    Edited by Ghost User
  • Patrick Bajao
  • Patrick Bajao removed review request for @patrickbajao

    removed review request for @patrickbajao

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :white_check_mark: test report for 5a9f0ac8

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Plan        | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Create      | 60     | 0      | 9       | 0     | 69    | ✅     |
    | Govern      | 3      | 0      | 0       | 0     | 3     | ✅     |
    | Monitor     | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Package     | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Data Stores | 2      | 0      | 0       | 0     | 2     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 73     | 0      | 10      | 0     | 83    | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+

    e2e-package-and-test: :white_check_mark: test report for 5a9f0ac8

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Create      | 568    | 0      | 58      | 0     | 626   | ✅     |
    | Data Stores | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Monitor     | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Package     | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Plan        | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Govern      | 6      | 0      | 0       | 0     | 6     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 594    | 0      | 60      | 0     | 654   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    Edited by Ghost User
  • Marc Shaw requested review from @patrickbajao

    requested review from @patrickbajao

  • Marc Shaw changed milestone to %16.10

    changed milestone to %16.10

  • Patrick Bajao removed review request for @patrickbajao

    removed review request for @patrickbajao

  • closed

  • reopened

  • Marc Shaw added 728 commits

    added 728 commits

    Compare with previous version

  • mentioned in issue #442010 (closed)

  • Marc Shaw added 1 commit

    added 1 commit

    • 768c0700 - Merge when checks pass should not need a pipeline to merge

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading