Commit 8ef76585 authored by Denys Mishunov's avatar Denys Mishunov

Merge branch '335316-change-any-eligible-user-to-all-eligible-users' into 'master'

Replace "any eligible user" with "eligible users"

See merge request gitlab-org/gitlab!70616
parents 3529c42c 811d49ec
...@@ -154,7 +154,7 @@ become eligible approvers in the project. To enable this merge request approval ...@@ -154,7 +154,7 @@ become eligible approvers in the project. To enable this merge request approval
1. Go to your project and select **Settings > General**. 1. Go to your project and select **Settings > General**.
1. Expand **Merge request (MR) approvals**. 1. Expand **Merge request (MR) approvals**.
1. Locate **Any eligible user** and select the number of approvals required: 1. Locate **Eligible users** and select the number of approvals required:
![MR approvals by Code Owners](img/mr_approvals_by_code_owners_v12_7.png) ![MR approvals by Code Owners](img/mr_approvals_by_code_owners_v12_7.png)
......
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
<template> <template>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<span class="mt-n1">{{ __('Any eligible user') }}</span> <span class="mt-n1">{{ __('Eligible users') }}</span>
<span id="popovercontainer" class="ml-2 align-self-end"> <span id="popovercontainer" class="ml-2 align-self-end">
<gl-icon <gl-icon
id="pop-approver" id="pop-approver"
......
...@@ -20,10 +20,10 @@ describe('Empty Rule Name', () => { ...@@ -20,10 +20,10 @@ describe('Empty Rule Name', () => {
wrapper = null; wrapper = null;
}); });
it('has a rule name "Any eligible user"', () => { it('has a rule name "Eligible users"', () => {
createComponent(); createComponent();
expect(wrapper.text()).toContain('Any eligible user'); expect(wrapper.text()).toContain('Eligible users');
}); });
it('renders a "more information" link ', () => { it('renders a "more information" link ', () => {
......
...@@ -3937,9 +3937,6 @@ msgstr "" ...@@ -3937,9 +3937,6 @@ msgstr ""
msgid "Any Milestone" msgid "Any Milestone"
msgstr "" msgstr ""
msgid "Any eligible user"
msgstr ""
msgid "Any encrypted tokens" msgid "Any encrypted tokens"
msgstr "" msgstr ""
...@@ -12346,6 +12343,9 @@ msgstr "" ...@@ -12346,6 +12343,9 @@ msgstr ""
msgid "Elastic|None. Select projects to index." msgid "Elastic|None. Select projects to index."
msgstr "" msgstr ""
msgid "Eligible users"
msgstr ""
msgid "Email" msgid "Email"
msgstr "" 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