WIP: Project option to require allow collaboration on merge requests
What does this MR do?
Add new project configuration boolean, merge_requests_require_allow_collaboration
to allow maintainers of FF-only projects to merge MRs from GitLab.
Closes #25889
Moved from gitlab-foss!30789 (closed)
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation created/updated or follow-up review issue created -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Performance and testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Merge request reports
Activity
added Community contribution label
added Community challenge devopscreate merge requests labels
@oswaldo could you continue with the review? This has been moved from
gitlab-foss
as you can seeassigned to @oswaldo
Sorry, there's still two action items on me from before and I need to get CI passing. Will try to turn this around this week.
@rpaik Please assign the PR back to me.
assigned to @prashcr
assigned to @prashcr
added 2 commits
added 2 commits
added 2 commits
added 2 commits
added 2 commits
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
@oswaldo Ready for another review
. There are a few tasks remaining, but I'd like a review before moving forward.I'd also like your opinion on how we should approach the conflict between creating protected branches and the allow collaboration feature.
- Block protected branches from being created when the branch has open MRs that allow collaboration
- Display list of open MRs in the error
- Automatically close MRs that allow collaboration when a protected branch is created
In both cases, we will also have to block reopening of MRs with
allow_collaboration = true
. I'll add a spec to confirm this behavior.Edited by Prashanth Chandra - Block protected branches from being created when the branch has open MRs that allow collaboration
assigned to @patrickbajao
added 743 commits
-
1206abb0...b70abe63 - 722 commits from branch
gitlab-org:master
- 1a7194ba - Squashed commit of the following:
- 07564c18 - Fix schema.rb
- be6c6cb2 - doc(lint): fix whitespace
- 342cdd04 - test: Fix typo in MR create service spec
- a2cc0724 - Fix param unset during MR creation, add feat spec
- 95063260 - test: add MR create service spec
- bd8672d3 - Update locales text
- e39bcf39 - Fix doc whitespace
- 2c36e703 - doc: fix broken anchor
- b909fda5 - Fix assign allow_maintainer_to_push
- 3c565d05 - Rm user param from can_*_collab?
- 5d842bcf - Assign author early in CreateService
- 21e653b5 - Fix can_toggle_collaboration? in model spec
- 456373d9 - Rm trailing comma in hash
- 05ac7c3f - doc: update MR ID in changelog
- 81c23809 - Fix spec filename and simplify spec setup
- 8bd92c29 - Simplify validate_collaboration
- 45ae1b80 - Fix can_*_collaboration user param
- 8bc615d1 - Use should_allow_collaboration?
- e6336dec - Improve MR build/create/model specs
- f982d669 - Improve MR validation and reduce diff
Toggle commit list-
1206abb0...b70abe63 - 722 commits from branch
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Prashanth Chandra
- Resolved by Patrick Bajao
- Resolved by Prashanth Chandra
unassigned @patrickbajao
added 2 commits
- Resolved by Bob Van Landuyt
Thanks for the review. I'll check to make sure we handle protected branches properly before the next review @patrickbajao
added 843 commits
-
83e363ad...e14c6709 - 842 commits from branch
gitlab-org:master
- a604bf13 - Merge branch 'master' into project-option-to-require-allow-collaboration-on-merge-requests-squashed
-
83e363ad...e14c6709 - 842 commits from branch
added 1 commit
- 0abee7f0 - Merge branch 'master' into project-option-to-require-allow-collaboration-on-merge-requests-squashed
- Resolved by Prashanth Chandra
added 2 commits
- Resolved by Bob Van Landuyt
@reprazent Ready for a review
- Resolved by Bob Van Landuyt