Add extra information to state change notes
What does this MR do and why?
This MR updates merged state change note when related MRs get marked as merged when its diff_head_sha
is included in another MR which just got merged. Users are getting confused as we currently just say merged
regardless of why we mark them as merged. Only the MRs that get merged via GitLab UI should have a note that just say merged
after this change.
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
When merging of another MR via GitLab UI triggered the merge:
When merging manually outside of GitLab UI triggered merge:
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
Related to #436061 (closed)
Merge request reports
Activity
changed milestone to %16.11
assigned to @dskim_gitlab
added 1 commit
- d54dbaca - Improve system note messaging for assumed merges
added 1 commit
- 08f708c7 - Improve system note messaging for assumed merges
4 Warnings This MR changes code in ee/
, but its Changelog commit is missing theEE: true
trailer. Consider adding it to your Changelog commits.914092e9: The commit body should not contain more than 72 characters per line. For more information, take a look at our Commit message guidelines. f4e2f86f: Commits that change 30 or more lines across at least 3 files should describe these changes in the commit body. For more information, take a look at our Commit message guidelines. featureaddition and featureenhancement merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the Technical Writer counterpart.
For more information, see:
- The Handbook page on merge request types.
- The definition of done documentation.
Reviewer roulette
Category Reviewer Maintainer backend @sam.figueroa
(UTC+0, 10 hours behind author)
@jarka
(UTC+2, 8 hours behind author)
database @minac
(UTC+3, 7 hours behind author)
@DylanGriffith
(UTC+10, same timezone as author)
UX @pedroms
(UTC+1, 9 hours behind author)
Maintainer review is optional for UX Please check reviewer's status!
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
danger-review
job that generated this comment.Generated by
Danger- Resolved by Sincheol (David) Kim
@phikai @kerrizor It's a draft MR with no test coverage and etc yet, but I just want to get some early feedback on this.
We already had a concept of
event_source
which can either be aCommit
orMergeRequest
within StateNote so I'm utilizing that to distinguish them. We could've just let it say which commit caused it as well, but it didn't seem necessary so I opted formerged manually
When a MR includes the
diff_head_sha
of the current MR:When no other MRs include the
diff_head_sha
of the current MR:
added 1178 commits
-
08f708c7...5700be1d - 1175 commits from branch
master
- c831ef84 - Improve system note messaging for assumed merges
- 40e455dd - Add spec to cover merge_requests notes
- 18a5919d - Add an extra spec to cover providing an event source
Toggle commit list-
08f708c7...5700be1d - 1175 commits from branch
added 322 commits
-
18a5919d...77e21fb3 - 319 commits from branch
master
- 914092e9 - Improve system note messaging for assumed merges
- 4b1ed369 - Add spec to cover merge_requests notes
- 51b9a4d0 - Add an extra spec to cover providing an event source
Toggle commit list-
18a5919d...77e21fb3 - 319 commits from branch
requested review from @aqualls
removed review request for @aqualls
- A deleted user
added database databasereview pending labels
- Resolved by Leaminn Ma
- Resolved by Sincheol (David) Kim
requested review from @kerrizor
- Resolved by Sincheol (David) Kim
requested review from @dgruzd
- Resolved by Sincheol (David) Kim
@aqualls Do you think we need to add/update any docs for this?
requested review from @aqualls
added databasereviewed workflowin review labels and removed databasereview pending workflowin dev labels
requested review from @DylanGriffith and removed review request for @dgruzd
added pipeline:mr-approved label
- Resolved by Leaminn Ma
@dgruzd
, thanks for approving this merge request.This is the first time the merge request has been approved. To ensure we don't only run predictive pipelines, and we don't break
master
, a new pipeline will be started shortly.Please wait for the pipeline to start before resolving this discussion and set auto-merge for the new pipeline. See merging a merge request for more details.
E2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for f4e2f86fexpand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Data Stores | 31 | 0 | 0 | 0 | 31 | ✅ | | Create | 83 | 0 | 9 | 0 | 92 | ✅ | | Govern | 56 | 0 | 10 | 0 | 66 | ✅ | | Plan | 51 | 0 | 2 | 0 | 53 | ✅ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | | Package | 24 | 0 | 6 | 0 | 30 | ✅ | | Verify | 35 | 0 | 1 | 0 | 36 | ✅ | | Monitor | 7 | 0 | 0 | 0 | 7 | ✅ | | Manage | 0 | 0 | 1 | 0 | 1 | ➖ | | Release | 5 | 0 | 0 | 0 | 5 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 294 | 0 | 29 | 0 | 323 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
e2e-package-and-test:
test report for f4e2f86fexpand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Create | 570 | 0 | 66 | 10 | 636 | ✅ | | Package | 0 | 0 | 2 | 0 | 2 | ➖ | | Govern | 6 | 0 | 0 | 0 | 6 | ✅ | | Plan | 8 | 0 | 0 | 0 | 8 | ✅ | | Monitor | 8 | 0 | 0 | 0 | 8 | ✅ | | Data Stores | 4 | 0 | 0 | 0 | 4 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 596 | 0 | 68 | 10 | 664 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
added tw-weight3 twfinished labels and removed twtriaged label
removed review request for @aqualls
requested review from @lma-git
mentioned in issue #455485
added databaseapproved label and removed databasereviewed label
removed review request for @DylanGriffith
enabled an automatic merge when the pipeline for 38a6697a succeeds
Hello @dskim_gitlab
The database team is looking for ways to improve the database review process and we would love your help!
If you'd be open to someone on the database team reaching out to you for a chat, or if you'd like to leave some feedback asynchronously, just post a reply to this comment mentioning:
@gitlab-org/database-team
And someone will be by shortly!
Thanks for your help!
This message was generated automatically. You're welcome to improve it.
mentioned in commit 95a5e7dc
added workflowstaging-canary label and removed workflowin review label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label