diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-29 19:23:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-29 19:23:03 +0000 |
| commit | 1d34ce13fca6f9ef316a23527a397021446c9f58 (patch) | |
| tree | abb7eab451fdb2c5c60ae4347258a719db8979bb /app/views | |
| parent | c051630aa88d3394a77108aa8ad422c91b0aec9f (diff) | |
| parent | d2971315abd0e6e94860505e50ec71082c3679da (diff) | |
| download | gitlab-ce-1d34ce13fca6f9ef316a23527a397021446c9f58.tar.gz | |
Merge branch 'issue_3359_3' into 'master'
Insert notification settings dropdown into groups
## Display notification settings dropdown for groups
part of #3359
See merge request !4857
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index aecefbc6e8f..a0a6762edcf 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -15,12 +15,17 @@ %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, fw: false) + %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 |