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
30f99608
Commit
30f99608
authored
Mar 14, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some missing permission conditions
parent
f4794659
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
app/views/groups/_settings_head.html.haml
app/views/groups/_settings_head.html.haml
+7
-4
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+5
-7
No files found.
app/views/groups/_settings_head.html.haml
View file @
30f99608
-
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'
...
@@ -8,7 +10,8 @@
...
@@ -8,7 +10,8 @@
%span
%span
Projects
Projects
=
nav_link
(
path:
'groups#edit'
)
do
-
if
can_edit
&&
can_admin_group
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
=
nav_link
(
path:
'groups#edit'
)
do
%span
=
link_to
edit_group_path
(
@group
),
title:
'Edit Group'
do
Edit Group
%span
Edit Group
app/views/layouts/nav/_group.html.haml
View file @
30f99608
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_admin_group
=
can?
(
current_user
,
:admin_group
,
@group
)
-
can_edit
=
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'
)
...
@@ -26,9 +25,8 @@
...
@@ -26,9 +25,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
-
if
current_user
&&
can_admin_group
-
if
can_admin_group
||
can_edit
=
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
projects_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