Skip to content
Snippets Groups Projects

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

Performance and testing

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
Edited by 🤖 GitLab Bot 🤖

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
  • Prashanth Chandra
  • Prashanth Chandra
  • Prashanth Chandra
    • Resolved by Prashanth Chandra

      @oswaldo Ready for another review :eyes:. 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.

      1. Block protected branches from being created when the branch has open MRs that allow collaboration
        1. Display list of open MRs in the error
      2. 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
  • Prashanth Chandra added 743 commits

    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

    Compare with previous version

  • Patrick Bajao
  • Patrick Bajao
  • added 2 commits

    • 86f83cb2 - Rm author assign in CreateService
    • f205ccd7 - Simplify MR BuildService spec

    Compare with previous version

  • added 3 commits

    • 05db8750 - Fix BuildService spec and add TODO
    • 36145eb6 - Rename must_allow to requires_allow
    • c18aeff7 - Extract #toggle_allow_maintainer_to_push

    Compare with previous version

  • added 5 commits

    Compare with previous version

  • Prashanth Chandra added 843 commits

    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

    Compare with previous version

  • added 1 commit

    • 0abee7f0 - Merge branch 'master' into project-option-to-require-allow-collaboration-on-merge-requests-squashed

    Compare with previous version

  • Prashanth Chandra
  • added 2 commits

    Compare with previous version

  • @reprazent Ready for a review :mag:

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