Skip to content

Add matching branch info to branch column

Samantha Ming requested to merge 32930-matching-branch-code-owner-approval into master

Issue: #32930 (closed)

What does this MR do?

Add additional branch info to branch column. Information including matching branch and deleted branch.

image

Test Cases

Deleted Branch

  1. Navigate to Repository Branches page
  2. Click "New branch"
  3. Branch Name: enter "delete-branch"
  4. Delete that branch by clicking "Delete protected branch" trash can button
  5. Navigate to Repository Settings page > Expand "Protected Branches"
  6. In the Protect a branch form, select the "delete-branch" and click "Protect" button
  7. In the table, the "delete-branch" has the "Branch was deleted." message

image

Matching Branch

  1. Navigate to Repository Branches page
  2. Click "New branch"
  3. Branch Name: enter "wildcard-branch"
  4. Navigate to Repository Settings page > Expand "Protected Branches"
  5. In the Protect a branch form, enter branch "wildcard*"
  6. In the table, the "wildcard-branch" has a "# matching branches" message

image

Neither is deleted branch nor has matching Branch

  1. Navigate to Repository Branches page
  2. Click "New branch"
  3. Branch Name: enter "random-branch"
  4. Navigate to Repository Settings page > Expand "Protected Branches"
  5. In the Protect a branch form, select "random-branch"
  6. In the table, the "random-branch" has no message

image

Table View

  • Column is named "Branch" ~"Protected a branch"**

image

  • Table view doesn't contain "Last commit" column

image

Screenshots

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

Closes #32930 (closed)

Merge request reports