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
dd966238
Commit
dd966238
authored
Feb 28, 2017
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups
parent
58758bd5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
app/views/groups/_head.html.haml
app/views/groups/_head.html.haml
+1
-6
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+0
-1
app/views/groups/subgroups.html.haml
app/views/groups/subgroups.html.haml
+1
-0
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+5
-1
No files found.
app/views/groups/_head.html.haml
View file @
dd966238
...
...
@@ -3,7 +3,7 @@
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#subgroups'
]
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Group Home'
do
%span
Home
...
...
@@ -12,8 +12,3 @@
=
link_to
activity_group_path
(
@group
),
title:
'Activity'
do
%span
Activity
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
app/views/groups/group_members/index.html.haml
View file @
dd966238
-
page_title
"Members"
=
render
'groups/head'
.project-members-page.prepend-top-default
%h4
...
...
app/views/groups/subgroups.html.haml
View file @
dd966238
-
@no_container
=
true
=
render
'head'
=
render
'groups/home_panel'
.groups-header
{
class:
container_class
}
...
...
app/views/layouts/nav/_group.html.haml
View file @
dd966238
...
...
@@ -5,7 +5,7 @@
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'group
_members#index
'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'groups#show'
,
'groups#activity'
,
'group
s#subgroups
'
],
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
'Home'
do
%span
Group
...
...
@@ -21,3 +21,7 @@
Merge Requests
-
merge_requests
=
MergeRequestsFinder
.
new
(
current_user
,
group_id:
@group
.
id
,
state:
'opened'
,
non_archived:
true
).
execute
%span
.badge.count
=
number_with_delimiter
(
merge_requests
.
count
)
=
nav_link
(
path:
'group_members#index'
)
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
Members
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