Disallow reopening of locked merge request
What does this MR do?
It prevents reopening of locked merge requests. This MR is basically a clone of !21299 (merged) for merge requests.
Note: I did not add specific tests as !21299 (merged) did, because app/policies/merge_request_policy
is generally not tested at the moment (as opposed to issues_policy
). I can add this if necessary.
What are the relevant issue numbers?
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Security reports checked/validated by reviewer
Merge request reports
Activity
added Community contribution label
added Plan [DEPRECATED] label
cc/ @smcgivern
@engwan could you review this, please?
changed milestone to %11.8
added backend label
assigned to @engwan
- Resolved by Heinrich Lee Yu
- Resolved by Jan Beckmann
- Resolved by Jan Beckmann
assigned to @kingjan1999
Thanks @kingjan1999. Added some comments to your changes.
Feel free to let me know if you have any questions.
- Resolved by Jan Beckmann
Thanks @kingjan1999, changes look good to me. Just added a docs suggestion.
I think we need to add some specs though. Specially for cases like the user is the author or assignee, since we added
enable
for the author we need to verify it's superseded by theprevent
with the locked condition.The hierarchy of rules in the policy isn't explicit so it's better to have a test.
@kingjan1999 not sure if you can complete this for the
11.9
release?changed milestone to %11.9
added 1732 commits
-
e3300545...b923d1b5 - 1730 commits from branch
gitlab-org:master
- 4d8431b3 - Merge branch 'master' into 56864-reopen-locked-mr
- b313f659 - Add merge request policy spec, typo
-
e3300545...b923d1b5 - 1730 commits from branch
- Resolved by Jan Beckmann
- Resolved by Jan Beckmann
- Resolved by Jan Beckmann
- Resolved by Jan Beckmann
Thanks @kingjan1999. Added a few comments above.
Thanks @kingjan1999. Looks good to me.
@smcgivern Can you review / merge? I think we can skip frontend review here since it's a very minor change in the HAML?
assigned to @smcgivern
Thanks @kingjan1999, LGTM. Unfortunately this missed the feature freeze for 11.9 by a small amount, so it will go into 11.10.
changed milestone to %11.10
mentioned in commit e61cce36
mentioned in issue fdroid/fdroid-website#330 (closed)
mentioned in issue gitlab-org/release/tasks#731 (closed)
added devopsplan label