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
8d78e95a
Commit
8d78e95a
authored
Nov 21, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/gitlab@master
parent
96f3246b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/layouts/nav/sidebar/_admin.html.haml
app/views/layouts/nav/sidebar/_admin.html.haml
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/layouts/nav/sidebar/_admin.html.haml
View file @
8d78e95a
...
...
@@ -264,8 +264,8 @@
=
link_to
network_admin_application_settings_path
,
title:
_
(
'Network'
),
data:
{
qa_selector:
'admin_settings_network_item'
}
do
%span
=
_
(
'Network'
)
-
if
template_exists?
(
'admin/
application_settings/geo
'
)
=
nav_link
(
path:
'application_settings#geo'
)
do
-
if
template_exists?
(
'admin/
geo/settings/show
'
)
=
nav_link
do
=
link_to
geo_admin_application_settings_path
,
title:
_
(
'Geo'
)
do
%span
=
_
(
'Geo'
)
...
...
locale/gitlab.pot
View file @
8d78e95a
...
...
@@ -7764,6 +7764,9 @@ msgstr ""
msgid "Geo Nodes"
msgstr ""
msgid "Geo Settings"
msgstr ""
msgid "Geo allows you to replicate your GitLab instance to other geographical locations."
msgstr ""
...
...
@@ -8214,9 +8217,6 @@ msgstr ""
msgid "GitLab Enterprise Edition %{plan}"
msgstr ""
msgid "GitLab Geo"
msgstr ""
msgid "GitLab Group Runners can execute code for all the projects in this group."
msgstr ""
...
...
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