Commit 997e695c authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'mjang-MR-approval-instance-level' into 'master'

Set up instance-level MR approval UI text

See merge request gitlab-org/gitlab!49871
parents ae09018b 6b03c62b
---
title: Updated UI text to match style guidelines
merge_request: 49871
author:
type: other
......@@ -2,11 +2,11 @@
%section.settings.merge-request-approval-settings.no-animate{ class: ('expanded' if expanded_by_default?) }
.settings-header
%h4
= _('Merge requests approvals')
= _('Merge request (MR) approvals')
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
= _('Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings.')
= _('Regulate approvals by authors/committers. Affects all projects.')
.settings-content
%hr.clearfix.mt-0
......
......@@ -3,12 +3,12 @@
.form-check
= f.check_box :prevent_merge_requests_author_approval, class: 'form-check-input'
= f.label :prevent_merge_requests_author_approval, class: 'form-check-label' do
= _('Prevent approval of merge requests by merge request author')
= _('Prevent MR approvals by author.')
.form-check
= f.check_box :prevent_merge_requests_committers_approval, class: 'form-check-input'
= f.label :prevent_merge_requests_committers_approval, class: 'form-check-label' do
= _('Prevent approval of merge requests by merge request committers')
= _('Prevent MR approvals from users who make commits to the MR.')
.form-check
= f.check_box :disable_overriding_approvers_per_merge_request , class: 'form-check-input'
= f.label :disable_overriding_approvers_per_merge_request , class: 'form-check-label' do
= _('Prevent users from modifying merge request approvers list')
= _('Prevent users from modifying MR approval rules.')
---
title: Updated UI text to match style guidelines
merge_request: 49871
author:
type: other
......@@ -21,17 +21,17 @@ RSpec.describe 'Admin interacts with merge requests approvals settings' do
it 'updates instance-level merge request approval settings and enforces project-level ones' do
page.within('.merge-request-approval-settings') do
check 'Prevent approval of merge requests by merge request author'
check 'Prevent approval of merge requests by merge request committers'
check 'Prevent users from modifying merge request approvers list'
check 'Prevent MR approvals by author.'
check 'Prevent MR approvals from users who make commits to the MR.'
check 'Prevent users from modifying MR approval rules.'
click_button('Save changes')
end
visit(admin_push_rule_path)
expect(find_field('Prevent approval of merge requests by merge request author')).to be_checked
expect(find_field('Prevent approval of merge requests by merge request committers')).to be_checked
expect(find_field('Prevent users from modifying merge request approvers list')).to be_checked
expect(find_field('Prevent MR approvals by author.')).to be_checked
expect(find_field('Prevent MR approvals from users who make commits to the MR.')).to be_checked
expect(find_field('Prevent users from modifying MR approval rules.')).to be_checked
visit edit_project_path(project)
......
......@@ -14,7 +14,7 @@ RSpec.describe 'admin/push_rules/_merge_request_approvals' do
it 'shows settings form', :aggregate_failures do
render
expect(rendered).to have_content('Merge requests approvals')
expect(rendered).to have_content('Settings to prevent self-approval across all projects')
expect(rendered).to have_content('Merge request (MR) approvals')
expect(rendered).to have_content('Regulate approvals by authors/committers. Affects all projects.')
end
end
......@@ -17341,6 +17341,9 @@ msgstr ""
msgid "Merge request %{mr_link} was reviewed by %{mr_author}"
msgstr ""
msgid "Merge request (MR) approvals"
msgstr ""
msgid "Merge request approvals"
msgstr ""
......@@ -17356,9 +17359,6 @@ msgstr ""
msgid "Merge requests"
msgstr ""
msgid "Merge requests approvals"
msgstr ""
msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
msgstr ""
......@@ -21019,6 +21019,9 @@ msgstr ""
msgid "Prev"
msgstr ""
msgid "Prevent MR approvals by author."
msgstr ""
msgid "Prevent MR approvals by the author."
msgstr ""
......@@ -21028,12 +21031,6 @@ msgstr ""
msgid "Prevent adding new members to project membership within this group"
msgstr ""
msgid "Prevent approval of merge requests by merge request author"
msgstr ""
msgid "Prevent approval of merge requests by merge request committers"
msgstr ""
msgid "Prevent environment from auto-stopping"
msgstr ""
......@@ -21043,7 +21040,7 @@ msgstr ""
msgid "Prevent users from changing their profile name"
msgstr ""
msgid "Prevent users from modifying merge request approvers list"
msgid "Prevent users from modifying MR approval rules."
msgstr ""
msgid "Prevent users from performing write operations on GitLab while performing maintenance."
......@@ -23025,6 +23022,9 @@ msgstr ""
msgid "Registry setup"
msgstr ""
msgid "Regulate approvals by authors/committers. Affects all projects."
msgstr ""
msgid "Reindexing status"
msgstr ""
......@@ -25465,9 +25465,6 @@ msgstr ""
msgid "Settings related to the use and experience of using GitLab's Package Registry."
msgstr ""
msgid "Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings."
msgstr ""
msgid "Setup"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment