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
be0b3cc1
Commit
be0b3cc1
authored
Mar 14, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed "Edit Group" subtab to "General" and moved it
to the first option inside said subtab. Also code cleanup
parent
30f99608
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
app/views/groups/_settings_head.html.haml
app/views/groups/_settings_head.html.haml
+5
-8
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+2
-3
No files found.
app/views/groups/_settings_head.html.haml
View file @
be0b3cc1
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_edit
=
can?
(
current_user
,
:admin_group
,
@group
)
=
content_for
:sub_nav
do
=
content_for
:sub_nav
do
.scrolling-tabs-container.sub-nav-scroll
.scrolling-tabs-container.sub-nav-scroll
=
render
'shared/nav_scroll'
=
render
'shared/nav_scroll'
.nav-links.sub-nav.scrolling-tabs
.nav-links.sub-nav.scrolling-tabs
%ul
{
class:
container_class
}
%ul
{
class:
container_class
}
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
'General'
do
%span
General
=
nav_link
(
path:
'groups#projects'
)
do
=
nav_link
(
path:
'groups#projects'
)
do
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
=
link_to
projects_group_path
(
@group
),
title:
'Projects'
do
%span
%span
Projects
Projects
-
if
can_edit
&&
can_admin_group
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
%span
Edit Group
app/views/layouts/nav/_group.html.haml
View file @
be0b3cc1
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
.scrolling-tabs-container
{
class:
nav_control_class
}
.scrolling-tabs-container
{
class:
nav_control_class
}
.fade-left
.fade-left
=
icon
(
'angle-left'
)
=
icon
(
'angle-left'
)
...
@@ -25,8 +24,8 @@
...
@@ -25,8 +24,8 @@
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
=
link_to
group_group_members_path
(
@group
),
title:
'Members'
do
%span
%span
Members
Members
-
if
current_user
&&
can
_admin_group
-
if
current_user
&&
can
?
(
current_user
,
:admin_group
,
@group
)
=
nav_link
(
path:
%w[groups#projects groups#edit]
)
do
=
nav_link
(
path:
%w[groups#projects groups#edit]
)
do
=
link_to
projects
_group_path
(
@group
),
title:
'Settings'
do
=
link_to
edit
_group_path
(
@group
),
title:
'Settings'
do
%span
%span
Settings
Settings
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