Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
13529a0c
Commit
13529a0c
authored
Jan 21, 2022
by
Russell Dickenson
Committed by
Brandon Labuschagne
Jan 25, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI text for style compliance
Changelog: changed EE: true
parent
a6c0e0c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
10 deletions
+16
-10
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rules.vue
...ts/security_configuration/unconfigured_security_rules.vue
+1
-1
ee/app/assets/javascripts/approvals/constants.js
ee/app/assets/javascripts/approvals/constants.js
+5
-5
locale/gitlab.pot
locale/gitlab.pot
+10
-4
No files found.
ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rules.vue
View file @
13529a0c
...
...
@@ -47,7 +47,7 @@ export default {
{
name
:
LICENSE_CHECK_NAME
,
description
:
s__
(
'
SecurityApprovals|Requires approval for Denied licenses. %{linkStart}
More information
%{linkEnd}
'
,
'
SecurityApprovals|Requires approval for Denied licenses. %{linkStart}
Learn more.
%{linkEnd}
'
,
),
docsPath
:
this
.
licenseCheckHelpPagePath
,
},
...
...
ee/app/assets/javascripts/approvals/constants.js
View file @
13529a0c
...
...
@@ -75,16 +75,16 @@ export const APPROVAL_SETTINGS_I18N = {
};
export
const
PROJECT_APPROVAL_SETTINGS_LABELS_I18N
=
{
authorApprovalLabel
:
s__
(
'
ApprovalSettings|Prevent approval by author
.
'
),
authorApprovalLabel
:
s__
(
'
ApprovalSettings|Prevent approval by author
'
),
preventMrApprovalRuleEditLabel
:
s__
(
'
ApprovalSettings|Prevent editing approval rules in merge requests
.
'
,
'
ApprovalSettings|Prevent editing approval rules in merge requests
'
,
),
preventCommittersApprovalLabel
:
s__
(
'
ApprovalSettings|Prevent approvals by users who add commits
.
'
,
'
ApprovalSettings|Prevent approvals by users who add commits
'
,
),
requireUserPasswordLabel
:
s__
(
'
ApprovalSettings|Require user password to approve
.
'
),
requireUserPasswordLabel
:
s__
(
'
ApprovalSettings|Require user password to approve
'
),
removeApprovalsOnPushLabel
:
s__
(
'
ApprovalSettings|Remove all approvals when commits are added to the source branch
.
'
,
'
ApprovalSettings|Remove all approvals when commits are added to the source branch
'
,
),
};
...
...
locale/gitlab.pot
View file @
13529a0c
...
...
@@ -4494,22 +4494,28 @@ msgstr ""
msgid "ApprovalSettings|Merge request approval settings have been updated."
msgstr ""
msgid "ApprovalSettings|Prevent approval by author"
msgstr ""
msgid "ApprovalSettings|Prevent approval by author."
msgstr ""
msgid "ApprovalSettings|Prevent approvals by users who add commits"
msgstr ""
msgid "ApprovalSettings|Prevent approvals by users who add commits."
msgstr ""
msgid "ApprovalSettings|Prevent editing approval rules in merge requests
.
"
msgid "ApprovalSettings|Prevent editing approval rules in merge requests"
msgstr ""
msgid "ApprovalSettings|Prevent editing approval rules in projects and merge requests."
msgstr ""
msgid "ApprovalSettings|Remove all approvals when commits are added to the source branch
.
"
msgid "ApprovalSettings|Remove all approvals when commits are added to the source branch"
msgstr ""
msgid "ApprovalSettings|Require user password to approve
.
"
msgid "ApprovalSettings|Require user password to approve"
msgstr ""
msgid "ApprovalSettings|There was an error loading merge request approval settings."
...
...
@@ -31543,7 +31549,7 @@ msgstr ""
msgid "SecurityApprovals|License-Check"
msgstr ""
msgid "SecurityApprovals|Requires approval for Denied licenses. %{linkStart}
More information
%{linkEnd}"
msgid "SecurityApprovals|Requires approval for Denied licenses. %{linkStart}
Learn more.
%{linkEnd}"
msgstr ""
msgid "SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}Learn more.%{linkEnd}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment