Add matching branch info to branch column
Issue: #32930 (closed)
What does this MR do?
Add additional branch info to branch column. Information including matching branch and deleted branch.
Test Cases
Deleted Branch
- Navigate to Repository Branches page
- Click "New branch"
- Branch Name: enter "delete-branch"
- Delete that branch by clicking "Delete protected branch" trash can button
- Navigate to Repository Settings page > Expand "Protected Branches"
- In the Protect a branch form, select the "delete-branch" and click "Protect" button
-
In the table, the "delete-branch" has the "Branch was deleted." message
Matching Branch
- Navigate to Repository Branches page
- Click "New branch"
- Branch Name: enter "wildcard-branch"
- Navigate to Repository Settings page > Expand "Protected Branches"
- In the Protect a branch form, enter branch "wildcard*"
-
In the table, the "wildcard-branch" has a "# matching branches" message
Neither is deleted branch nor has matching Branch
- Navigate to Repository Branches page
- Click "New branch"
- Branch Name: enter "random-branch"
- Navigate to Repository Settings page > Expand "Protected Branches"
- In the Protect a branch form, select "random-branch"
-
In the table, the "random-branch" has no message
Table View
-
Column is named "Branch" ~"Protected a branch"**
-
Table view doesn't contain "Last commit" column
Screenshots
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
Closes #32930 (closed)