diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-14 11:41:19 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-14 11:41:19 +0200 |
| commit | 1d2173819bf004eaf9676aeb72b2ae6f79db9a64 (patch) | |
| tree | ca3d94231dda60373d4229d614bb4d7da57cf43e | |
| parent | 4e1c6019c8f0d3b00e32fd6cd546d2ef445a285d (diff) | |
| download | gitlab-ce-1d2173819bf004eaf9676aeb72b2ae6f79db9a64.tar.gz | |
Show activity/projects depends on access
| -rw-r--r-- | app/views/groups/show.html.haml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 7fd1b3f18c8..79bfb1ad177 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -16,22 +16,26 @@ = render 'shared/show_aside' - .row - %section.activities.col-md-7 - .hidden-xs - - if current_user - = render "events/event_last_push", event: @last_push + - if can?(current_user, :read_group, @group) + .row + %section.activities.col-md-7 + .hidden-xs + - if current_user + = render "events/event_last_push", event: @last_push - %ul.nav.nav-pills.event_filter.pull-right - %li - = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do - %i.fa.fa-rss + %ul.nav.nav-pills.event_filter.pull-right + %li + = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do + %i.fa.fa-rss - = render 'shared/event_filter' - %hr + = render 'shared/event_filter' + %hr - .content_list - = spinner - - if @projects.any? + .content_list + = spinner %aside.side.col-md-5 = render "projects", projects: @projects + - else + %p + = icon('lock') + This is a private group |