Split out mergeable/mergeable_state into more cohesive methods
We move the methods from mergeble?
to the mergeable_state?
because these checks are more about the state and it will allow us to move them to the new framework easier too. This doesn't change the functionality as mergeable?
method calls mergeable_state?
method too.
This change involves updating the status code returned for a particular endpoint due to the moving of the methods.
Related to #358237 (closed)
Merge request reports
Activity
changed milestone to %15.0
assigned to @marc_shaw
Suggested Reviewers (beta)
The individuals below may be good candidates to participate in the review based on various factors.
You can use slash commands in comments to quickly assign
/assign_reviewer @user1
.Suggested Reviewers @kushalpandya
,@iamphill
,@kerrizor
,@nick.thomas
,@reprazent
If you do not believe these suggestions are useful, please apply the label Bad Suggested Reviewer. You can also provide feedback for this feature on this issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/357923
.Automatically generated by Suggested Reviewers Bot - an experimental ML-based recommendation engine created by ~"group::applied ml".
Edited by GitLab Reviewer-Recommender Bot1 Warning This MR changes code in ee/
, but its Changelog commit is missing theEE: true
trailer. Consider adding it to your Changelog commits.1 Message This merge request adds or changes documentation files. A review from the Technical Writing team before you merge is recommended. Reviews can happen after you merge. If needed, you can retry the
danger-review
job that generated this comment.Documentation review
The following files require a review from a technical writer:
doc/api/merge_requests.md
The review does not need to block merging this merge request. See the:
-
Metadata for the
*.md
files that you've changed. The first few lines of each*.md
file identify the stage and group most closely associated with your docs change. - The Technical Writer assigned for that stage and group.
- Documentation workflows for information on when to assign a merge request for review.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Amparo Luna ( @a_luna
) (UTC-5, 17 hours behind@marc_shaw
)Kamil Trzciński ( @ayufan
) (UTC+2, 10 hours behind@marc_shaw
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
Generated by
DangerAllure report
allure-report-publisher
generated test report!review-qa-blocking:
test report for 268a423cexpand test summary
+---------------------------------------------------------------------------+ | suites summary | +----------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------------+--------+--------+---------+-------+-------+--------+ | Plan | 48 | 0 | 1 | 48 | 49 | ❗ | | Manage | 36 | 0 | 2 | 37 | 38 | ❗ | | Secure | 6 | 0 | 0 | 6 | 6 | ❗ | | Verify | 12 | 0 | 1 | 12 | 13 | ❗ | | Create | 23 | 0 | 2 | 22 | 25 | ❗ | | Protect | 2 | 0 | 0 | 2 | 2 | ❗ | | Configure | 0 | 0 | 1 | 0 | 1 | ➖ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | | Version sanity check | 0 | 0 | 1 | 0 | 1 | ➖ | +----------------------+--------+--------+---------+-------+-------+--------+ | Total | 127 | 0 | 9 | 127 | 136 | ❗ | +----------------------+--------+--------+---------+-------+-------+--------+
package-and-qa-ff-enabled:
test report for 268a423cexpand test summary
+---------------------------------------------------------------------------+ | suites summary | +----------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------------+--------+--------+---------+-------+-------+--------+ | Manage | 303 | 0 | 12 | 0 | 315 | ✅ | | Create | 447 | 0 | 18 | 22 | 465 | ❗ | | Verify | 120 | 0 | 9 | 0 | 129 | ✅ | | Plan | 159 | 0 | 3 | 0 | 162 | ✅ | | Release | 18 | 0 | 0 | 0 | 18 | ✅ | | Secure | 60 | 0 | 6 | 8 | 66 | ❗ | | Product Intelligence | 6 | 0 | 0 | 0 | 6 | ✅ | | Version sanity check | 0 | 0 | 3 | 2 | 3 | ➖ | | Fulfillment | 6 | 0 | 33 | 0 | 39 | ✅ | | Package | 0 | 0 | 9 | 0 | 9 | ➖ | | Configure | 0 | 0 | 9 | 0 | 9 | ➖ | | Protect | 6 | 0 | 0 | 0 | 6 | ✅ | +----------------------+--------+--------+---------+-------+-------+--------+ | Total | 1125 | 0 | 102 | 32 | 1227 | ❗ | +----------------------+--------+--------+---------+-------+-------+--------+
package-and-qa-ff-disabled:
test report for 268a423cexpand test summary
+---------------------------------------------------------------------------+ | suites summary | +----------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------------+--------+--------+---------+-------+-------+--------+ | Plan | 159 | 0 | 3 | 0 | 162 | ✅ | | Create | 447 | 0 | 18 | 18 | 465 | ❗ | | Package | 0 | 0 | 9 | 0 | 9 | ➖ | | Manage | 303 | 0 | 12 | 0 | 315 | ✅ | | Fulfillment | 6 | 0 | 33 | 0 | 39 | ✅ | | Secure | 60 | 0 | 6 | 8 | 66 | ❗ | | Verify | 120 | 0 | 9 | 0 | 129 | ✅ | | Product Intelligence | 6 | 0 | 0 | 0 | 6 | ✅ | | Release | 18 | 0 | 0 | 0 | 18 | ✅ | | Protect | 6 | 0 | 0 | 0 | 6 | ✅ | | Configure | 0 | 0 | 9 | 0 | 9 | ➖ | | Version sanity check | 0 | 0 | 3 | 3 | 3 | ➖ | +----------------------+--------+--------+---------+-------+-------+--------+ | Total | 1125 | 0 | 102 | 29 | 1227 | ❗ | +----------------------+--------+--------+---------+-------+-------+--------+
mentioned in issue #358237 (closed)
mentioned in merge request !86616 (merged)
mentioned in merge request !86617 (merged)
changed milestone to %15.1
added missed-deliverable missed:15.0 labels
mentioned in merge request !88362 (merged)
added 4260 commits
-
01ce3182...399ade37 - 4258 commits from branch
master
- e3d47bb3 - Move checks from mergeable to mergeable_state?
- 2e057e64 - Move logic when change_response_code_merge_status FF is off
-
01ce3182...399ade37 - 4258 commits from branch
added 1 commit
- df30ea2e - Move logic when change_response_code_merge_status FF is off
- Resolved by Kerri Miller
- The
gitlab-qa-mirror
downstream pipeline for !86515 (2e057e64) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (2e057e64) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (df30ea2e) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (df30ea2e) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (0c76a7d9) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (0c76a7d9) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (cdcb56d8) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (cdcb56d8) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (cdcb56d8) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (cdcb56d8) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (64e5dab5) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (64e5dab5) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (958d1b40) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (958d1b40) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (8226a5ce) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (8226a5ce) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (28ea3209) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (28ea3209) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (d0a3e8ac) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (d0a3e8ac) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (377b8535) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (377b8535) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (d57e016a) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (d57e016a) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (268a423c) failed! - The
gitlab-qa-mirror
downstream pipeline for !86515 (268a423c) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (268a423c) passed. - The
gitlab-qa-mirror
downstream pipeline for !86515 (268a423c) passed.
- The
added 1 commit
- 0c76a7d9 - Move logic when change_response_code_merge_status FF is off
added 1 commit
- cdcb56d8 - Move logic when change_response_code_merge_status FF is off
requested review from @kerrizor
- Resolved by Kerri Miller
- Resolved by Kerri Miller
- Resolved by Kerri Miller
- Resolved by Kerri Miller
- Resolved by Kerri Miller
- Resolved by Kerri Miller
- Resolved by Kerri Miller
added 903 commits
-
cdcb56d8...56bccbb3 - 901 commits from branch
master
- 5119c558 - Move checks from mergeable to mergeable_state?
- 64e5dab5 - Move logic when change_response_code_merge_status FF is off
-
cdcb56d8...56bccbb3 - 901 commits from branch
mentioned in issue create-stage#13007 (closed)
added 353 commits
-
958d1b40...d9f7fe78 - 350 commits from branch
master
- 28ff3135 - Move checks from mergeable to mergeable_state?
- ba72261a - Move logic when change_response_code_merge_status FF is off
- 8226a5ce - Fix minor typo in spec description
Toggle commit list-
958d1b40...d9f7fe78 - 350 commits from branch
assigned to @kerrizor
removed review request for @kerrizor
- Resolved by Marc Shaw
@marc_shaw Just a heads up - I know you're out this week, but I wanted to document that I'm going to pick this up and see if I can push this towards merge, so I'm dropping myself as a reviewer and joining you as an assignee
requested review from @a_luna
removed workflowready for development label
removed needs investigation label
added 22 commits
-
8226a5ce...c24770c1 - 19 commits from branch
master
- 63db131f - Move checks from mergeable to mergeable_state?
- 997ccf92 - Move logic when change_response_code_merge_status FF is off
- 28ea3209 - Fix minor typo in spec description
Toggle commit list-
8226a5ce...c24770c1 - 19 commits from branch
mentioned in issue create-stage#13014 (closed)
- Resolved by Kerri Miller
requested review from @robotmay_gitlab and removed review request for @a_luna
@a_luna
, thanks for approving this merge request.This is the first time the merge request is approved. To ensure full test coverage, a new pipeline has been started.
For more info, please refer to the following links:
added 507 commits
-
d0a3e8ac...c864e031 - 504 commits from branch
master
- f99bb6b3 - Move checks from mergeable to mergeable_state?
- bc141655 - Move logic when change_response_code_merge_status FF is off
- cead8c93 - Fix minor typo in spec description
Toggle commit list-
d0a3e8ac...c864e031 - 504 commits from branch
requested review from @terrichu and removed review request for @robotmay_gitlab
- Resolved by Marc Shaw
- Resolved by Kerri Miller
- Resolved by Marc Shaw
- Resolved by Terri Chu
removed review request for @terrichu
requested review from @terrichu
enabled an automatic merge when the pipeline for 8dc0fd9c succeeds
- Resolved by Kerri Miller
@kerrizor @marc_shaw danger is complaining about the MR title length, would one of you mind a look? I think re-running the last failed danger pipeline after a fix should merge the MR
mentioned in commit facc375b
added workflowstaging-canary label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added releasedpublished label
mentioned in merge request kubitus-project/kubitus-installer!1153 (merged)
added releasedcandidate label and removed releasedpublished label