diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-07 14:53:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-07 14:53:35 -0700 |
| commit | b3deab852bcbfe1fd86475d2881cd328c5374b05 (patch) | |
| tree | d5d0a16918d6b270ddb2b42758dfca71949a808f /app/helpers/groups_helper.rb | |
| parent | 7967793c5516d1966ed9e3468211529a48b18d9e (diff) | |
| parent | e0c0ce28ea786a23d15eee95d56560079b0c6dfe (diff) | |
| download | gitlab-ce-b3deab852bcbfe1fd86475d2881cd328c5374b05.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'app/helpers/groups_helper.rb')
| -rw-r--r-- | app/helpers/groups_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 95fea2f18d1..3c5c8bbd71b 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -128,8 +128,10 @@ module GroupsHelper def get_group_sidebar_links links = [:overview, :group_members] - if can?(current_user, :read_cross_project) - links += [:activity, :issues, :boards, :labels, :milestones, :merge_requests] + resources = [:activity, :issues, :boards, :labels, :milestones, + :merge_requests] + links += resources.select do |resource| + can?(current_user, "read_group_#{resource}".to_sym, @group) end if can?(current_user, :admin_group, @group) |