BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b9d547b1
Commit
b9d547b1
authored
Feb 06, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'
Override group sidebar links See merge request gitlab-org/gitlab-ce!16942
parents
41b5bb57
8114a2a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
groups_helper.rb
app/helpers/groups_helper.rb
+4
-0
_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+1
-1
fix-show-sidebar-sub-level-items-for-billing.yml
...released/fix-show-sidebar-sub-level-items-for-billing.yml
+5
-0
No files found.
app/helpers/groups_helper.rb
View file @
b9d547b1
module
GroupsHelper
def
group_nav_link_paths
%w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]
end
def
can_change_group_visibility_level?
(
group
)
can?
(
current_user
,
:change_visibility_level
,
group
)
end
...
...
app/views/layouts/nav/sidebar/_group.html.haml
View file @
b9d547b1
...
...
@@ -88,7 +88,7 @@
%strong
.fly-out-top-item-name
#{
_
(
'Members'
)
}
-
if
current_user
&&
can?
(
current_user
,
:admin_group
,
@group
)
=
nav_link
(
path:
%w[groups#projects groups#edit ci_cd#show]
)
do
=
nav_link
(
path:
group_nav_link_paths
)
do
=
link_to
edit_group_path
(
@group
)
do
.nav-icon-container
=
sprite_icon
(
'settings'
)
...
...
changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
0 → 100644
View file @
b9d547b1
---
title
:
Override group sidebar links
merge_request
:
16942
author
:
George Tsiolis
type
:
fixed
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