<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=506733) </details> <!--IssueSummary end--> <!--- Please read this! Before opening a new issue, make sure to search for keywords in the issues filtered by the "regression" or "type::bug" label: - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug and verify the issue you're about to submit isn't a duplicate. ---> ### Summary Discovered during the investigation https://gitlab.com/gitlab-com/dev-sub-department/section-dev-request-for-help/-/issues/339#note_2228467708. #### Setup A project with two protected branches: * Protected branch with name: `main` * Protected branch with wildcard: `*main*` (also matches branch `main`) An approval rule is set for branch 'main' for a Reporters group ([see configuration](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/rules.html#enable-approval-permissions-for-users-with-the-reporter-role)). ##### Problem Policy [`merge_request_group_approver`](https://gitlab.com/gitlab-org/gitlab/-/blob/ee26f651959d5f06c4ab0b7a404b3501b4910480/ee/app/policies/ee/merge_request_policy.rb#L30-36) returns `false`. It happens because the code below matches protected branch with wildcard `*main*` that doesn't have approval rules. ```ruby protected_branch = project .protected_branches .find { |pb| pb.matches?(@subject.target_branch) } ``` as a result ```ruby protected_branch.approval_project_rules => [] protected_branch.approval_project_rules.for_groups(@user.group_members.reporters.select(:source_id)).exists? => false ``` ### Possible fixes I believe that the condition [`merge_request_group_approver`](https://gitlab.com/gitlab-org/gitlab/-/blob/ee26f651959d5f06c4ab0b7a404b3501b4910480/ee/app/policies/ee/merge_request_policy.rb#L30-36) is incorrect. Why do we check approval rules of the project? It's possible that merge request might have customized rules. It sounds more logical to check approval rules of the merge request rather than the project. ```ruby condition(:merge_request_group_approver, score: 140) do @subject.approval_rules.for_groups(@user.group_members.reporters.select(:source_id)).exists? end ``` **Note:** `for_groups` scope should use `approval_merge_request_rules_groups` instead of [`approval_project_rules_groups`](https://gitlab.com/gitlab-org/gitlab/-/blob/9c920f3ebfe1553e9851dc3f2e8501ab278f6a5c/ee/app/models/concerns/approval_rule_like.rb#L29) ### Steps to reproduce 1. Create a new project 1. Add two protected branches with name `main` and `*main*` 1. Enable approval permissions for Reporters for branch `main` ([see documentation](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/rules.html#enable-approval-permissions-for-users-with-the-reporter-role)). 1. As a Reporter user try to approve the merge request **Note:** I haven't reproduced it. If it's still doesn't work, check the original issue: https://gitlab.com/gitlab-com/dev-sub-department/section-dev-request-for-help/-/issues/339. ### Example Project <!-- If possible, please create an example project here on GitLab.com that exhibits the problematic behavior, and link to it here in the bug report. If you are using an older version of GitLab, this will also determine whether the bug is fixed in a more recent version. --> ### What is the current *bug* behavior? Reporters do not see the Approve button on Merge Requests ### What is the expected *correct* behavior? Reporters should see the Approve button on Merge Requests ### Relevant logs and/or screenshots <!-- Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's tough to read otherwise. --> ### Output of checks <!-- If you are reporting a bug on GitLab.com, uncomment below --> <!-- This bug happens on GitLab.com --> <!-- and uncomment below if you have /label privileges --> <!-- /label ~"reproduced on GitLab.com" --> <!-- or follow up with an issue comment of `@gitlab-bot label ~"reproduced on GitLab.com"` if you do not --> #### Results of GitLab environment info <!-- Input any relevant GitLab environment information if needed. --> <details> <summary>Expand for output related to GitLab environment info</summary> <pre> (For installations with omnibus-gitlab package run and paste the output of: `sudo gitlab-rake gitlab:env:info`) (For installations from source run and paste the output of: `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`) </pre> </details> #### Results of GitLab application Check <!-- Input any relevant GitLab application check information if needed. --> <details> <summary>Expand for output related to the GitLab application check</summary> <pre> (For installations with omnibus-gitlab package run and paste the output of: `sudo gitlab-rake gitlab:check SANITIZE=true`) (For installations from source run and paste the output of: `sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`) (we will only investigate if the tests are passing) </pre> </details> ### Possible fixes <!-- If you can, link to the line of code that might be responsible for the problem. --> <!-- If you don't have /label privileges, follow up with an issue comment of `@gitlab-bot label ~"type::bug"` -->