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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
1774aa28
Commit
1774aa28
authored
Dec 22, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder sidebar menu item for group clusters
parent
89b0be14
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
13 deletions
+18
-13
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+13
-13
changelogs/unreleased/gt-reorder-group-sidebar-menu-items.yml
...gelogs/unreleased/gt-reorder-group-sidebar-menu-items.yml
+5
-0
No files found.
app/views/layouts/nav/sidebar/_group.html.haml
View file @
1774aa28
...
@@ -103,19 +103,6 @@
...
@@ -103,19 +103,6 @@
=
_
(
'Merge Requests'
)
=
_
(
'Merge Requests'
)
%span
.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
merge_requests_count
)
%span
.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
merge_requests_count
)
-
if
group_sidebar_link?
(
:group_members
)
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
)
do
.nav-icon-container
=
sprite_icon
(
'users'
)
%span
.nav-item-name.qa-group-members-item
=
_
(
'Members'
)
%ul
.sidebar-sub-level-items.is-fly-out-only
=
nav_link
(
path:
'group_members#index'
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
group_group_members_path
(
@group
)
do
%strong
.fly-out-top-item-name
=
_
(
'Members'
)
-
if
group_sidebar_link?
(
:kubernetes
)
-
if
group_sidebar_link?
(
:kubernetes
)
=
nav_link
(
controller:
[
:clusters
])
do
=
nav_link
(
controller:
[
:clusters
])
do
=
link_to
group_clusters_path
(
@group
)
do
=
link_to
group_clusters_path
(
@group
)
do
...
@@ -129,6 +116,19 @@
...
@@ -129,6 +116,19 @@
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
=
_
(
'Kubernetes'
)
=
_
(
'Kubernetes'
)
-
if
group_sidebar_link?
(
:group_members
)
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
)
do
.nav-icon-container
=
sprite_icon
(
'users'
)
%span
.nav-item-name.qa-group-members-item
=
_
(
'Members'
)
%ul
.sidebar-sub-level-items.is-fly-out-only
=
nav_link
(
path:
'group_members#index'
,
html_options:
{
class:
"fly-out-top-item"
}
)
do
=
link_to
group_group_members_path
(
@group
)
do
%strong
.fly-out-top-item-name
=
_
(
'Members'
)
-
if
group_sidebar_link?
(
:settings
)
-
if
group_sidebar_link?
(
:settings
)
=
nav_link
(
path:
group_nav_link_paths
)
do
=
nav_link
(
path:
group_nav_link_paths
)
do
=
link_to
edit_group_path
(
@group
)
do
=
link_to
edit_group_path
(
@group
)
do
...
...
changelogs/unreleased/gt-reorder-group-sidebar-menu-items.yml
0 → 100644
View file @
1774aa28
---
title
:
Reorder sidebar menu item for group clusters
merge_request
:
24001
author
:
George Tsiolis
type
:
changed
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