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
e2af198b
Commit
e2af198b
authored
Oct 24, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the collapsed admin geo link flyout not showing
parent
8418dba4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
changelogs/unreleased/ph-fixAdminGeoSidebarFlyOut.yml
changelogs/unreleased/ph-fixAdminGeoSidebarFlyOut.yml
+5
-0
ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml
ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml
+6
-6
No files found.
changelogs/unreleased/ph-fixAdminGeoSidebarFlyOut.yml
0 → 100644
View file @
e2af198b
---
title
:
Fixed admin geo collapsed sidebar fly out not showing
merge_request
:
19012
author
:
type
:
fixed
ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml
View file @
e2af198b
...
@@ -4,12 +4,12 @@
...
@@ -4,12 +4,12 @@
=
sprite_icon
(
'location-dot'
)
=
sprite_icon
(
'location-dot'
)
%span
.nav-item-name
%span
.nav-item-name
#{
_
(
'Geo'
)
}
#{
_
(
'Geo'
)
}
-
if
Gitlab
::
Geo
.
secondary?
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
=
nav_link
(
controller:
'admin/geo/nodes'
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
nav_link
(
controller:
'admin/geo/nodes'
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
admin_geo_nodes_path
do
=
link_to
admin_geo_nodes_path
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
#{
_
(
'Geo'
)
}
#{
_
(
'Geo'
)
}
-
if
Gitlab
::
Geo
.
secondary?
%li
.divider.fly-out-top-item
%li
.divider.fly-out-top-item
=
nav_link
(
path:
'admin/geo/nodes#index'
)
do
=
nav_link
(
path:
'admin/geo/nodes#index'
)
do
=
link_to
admin_geo_nodes_path
,
title:
'Nodes'
do
=
link_to
admin_geo_nodes_path
,
title:
'Nodes'
do
...
...
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