Follow-up: Update the approval settings options text
With !66536 (merged) we have updated the projects approval settings to use the same Vue components as the group approval settings.
During this process, it was determined that the approval settings options text could be improved to make the settings easier to read and understand.
Proposal
Therefore, we should update the text set in http://gitlab.com/gitlab-org/gitlab/blob/master/ee/app/assets/javascripts/approvals/constants.js#L52 to:
Admin Area: Merge request approval settings
- [ ] Prevent approval by author.
- [ ] Prevent approvals by users who add commits.
- [ ] Prevent editing approval rules in projects and merge requests.
Group: Merge request approval settings
- [ ] Prevent approval by author.
- [ ] Prevent approvals by users who add commits.
- [ ] Prevent editing approval rules in projects and merge requests.
- [ ] Require user password to approve.
- [ ] Remove all approvals when commits are added to the source branch.
Project: Merge request approval settings
- [ ] Prevent approval by author.
- [ ] Prevent approvals by users who add commits.
- [ ] Prevent editing approval rules in merge requests.
- [ ] Require user password to approve.
- [ ] Remove all approvals when commits are added to the source branch.
Create a consistent heading and description, and remove individual help links
Approval settings
Define how approval rules are applied as a merge request moves toward completion. Learn more
Implementation
- Update the
ApprovalSettings
component to render theApprovalSettingsCheckbox
in the suggested order. (Done → ba8742e8) - Update strings in
_merge_request_approvals_fields.html.haml
to match the admin area suggestions. - Update docs
Edited by Austin Regnery