diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:50:19 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:04:18 -0300 |
| commit | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (patch) | |
| tree | 8c66cdb03c4429bf326711d8bd6956fbf45252b7 /app/views/groups/show.html.haml | |
| parent | 2674b548601b279ada46d4b218a9def6fd5b9f6d (diff) | |
| parent | 92e183542fe0e13930220ba3bbf67b9197cfc026 (diff) | |
| download | gitlab-ce-36d48120f66d52dcc8697893ca1ab85322ba7c8b.tar.gz | |
merge master into issue_3359_3
Diffstat (limited to 'app/views/groups/show.html.haml')
| -rw-r--r-- | app/views/groups/show.html.haml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 5792c5dbac5..a0a6762edcf 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -15,14 +15,17 @@ %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, fw: false) - = render 'notifications/buttons/notifications', notification_setting: @notification_setting + %span.hidden-xs + = render 'shared/notifications/button', notification_setting: @notification_setting + + - if current_user + .pull-right + = render 'shared/members/access_request_buttons', source: @group - if @group.description.present? .cover-desc.description = markdown(@group.description, pipeline: :description) - - if current_user - = render 'shared/members/access_request_buttons', source: @group %div{ class: container_class } .top-area |