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
14e48da4
Commit
14e48da4
authored
Jan 21, 2021
by
Nick Gaskill
Committed by
Brandon Labuschagne
Jan 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Edit UI text for protected environments
parent
e12af2f3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
changelogs/unreleased/ui-text-protected-environments.yml
changelogs/unreleased/ui-text-protected-environments.yml
+5
-0
ee/app/views/projects/protected_environments/_environments_list.html.haml
...jects/protected_environments/_environments_list.html.haml
+1
-1
ee/app/views/projects/settings/ci_cd/_protected_environments.html.haml
...projects/settings/ci_cd/_protected_environments.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+4
-4
No files found.
changelogs/unreleased/ui-text-protected-environments.yml
0 → 100644
View file @
14e48da4
---
title
:
Updated UI text to match style guidelines
merge_request
:
52152
author
:
type
:
other
ee/app/views/projects/protected_environments/_environments_list.html.haml
View file @
14e48da4
.protected-branches-list.js-protected-environments-list
-
if
@protected_environments
.
empty?
%p
.settings-message.text-center
=
s_
(
'ProtectedEnvironment|There are currently no protected environments
, protect an environment with the form above
.'
)
=
s_
(
'ProtectedEnvironment|There are currently no protected environments
. Protect an environment with this form
.'
)
-
else
%table
.table.table-bordered
%colgroup
...
...
ee/app/views/projects/settings/ci_cd/_protected_environments.html.haml
View file @
14e48da4
...
...
@@ -9,7 +9,7 @@
%button
.btn.gl-button.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
s_
(
'ProtectedEnvironment|
Protecting an environment restricts the users who can execute deployments
.'
)
=
s_
(
'ProtectedEnvironment|
Only specified users can execute deployments in a protected environment
.'
)
.settings-content
=
render
'projects/protected_environments/form'
...
...
locale/gitlab.pot
View file @
14e48da4
...
...
@@ -23076,6 +23076,9 @@ msgstr ""
msgid "ProtectedEnvironment|Environment"
msgstr ""
msgid "ProtectedEnvironment|Only specified users can execute deployments in a protected environment."
msgstr ""
msgid "ProtectedEnvironment|Protect"
msgstr ""
...
...
@@ -23085,9 +23088,6 @@ msgstr ""
msgid "ProtectedEnvironment|Protected Environment (%{protected_environments_count})"
msgstr ""
msgid "ProtectedEnvironment|Protecting an environment restricts the users who can execute deployments."
msgstr ""
msgid "ProtectedEnvironment|Select an environment"
msgstr ""
...
...
@@ -23097,7 +23097,7 @@ msgstr ""
msgid "ProtectedEnvironment|Select users to deploy and manage Feature Flag settings"
msgstr ""
msgid "ProtectedEnvironment|There are currently no protected environments
, protect an environment with the form above
."
msgid "ProtectedEnvironment|There are currently no protected environments
. Protect an environment with this form
."
msgstr ""
msgid "ProtectedEnvironment|Unprotect"
...
...
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