Skip to content

Display indicator to rule name

Samantha Ming requested to merge 199795-fe-overridden-property into master

What does this MR do?

Display Indicator in the Approval Rules

image

Testing Case

Setup

Let's setup our rules in the project settings

  1. Go to Settings > General > expand "Merge request approvals"
  2. Add a new approval rule
  3. Create a new rule named "Project Rule" and target it to any branch
  4. Create a new rule named "Project Rule 2" and target it to any branch

image

Edit Rule

(You might need to create a new MR if you don't have any)

  1. Find a MR and click "edit"
  2. Edit your MR so it looks like this and click "Save changes"

image

  1. Once you click save changes it will navigate to your MR
  2. Click "edit"
  • Your approval rules should look like this:
  • There is an "Overridden" indicator on the project setting rule you edited
  • There is an "Added for this merge request" indicator on the new local rule you created

image

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability 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

Closes #199795 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports