diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-01 15:48:13 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-06 19:29:01 +0300 |
commit | ee4e66590ba2b3e845dd6be44277d3a18336a422 (patch) | |
tree | 25546b557903154824de65e4af20c968f47bcff9 /app/views/groups | |
parent | 9f039661bc61de67e47f189a041c1e28f7266820 (diff) |
Merge branch '18310-improve-request-access-button' into 'master'
Improve the request / withdraw access button
It implements the design proposed in #18310.
No.
To close #18310.
Closes #18310.
| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/a1de370dcbb8ac9a63d2df5c68591db7/request_access_button.png) | ![request_access_button-large](/uploads/0a1c70380268e620a6ca4d3e1661d58c/request_access_button-large.png) |
| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/c9df39d04b61566ec143d5e9cc43ada2/withdraw_access_request_button.png) | ![withdraw_access_request_button-large](/uploads/10fdaa94d72956e06bdb995e65b51472/withdraw_access_request_button-large.png) |
| Medium | Large |
| ----------- | ------- |
| ![request_access_button](/uploads/8e71395041a5cea996a35df2083bb723/request_access_button.png) | ![project-request_access_button-large](/uploads/adb2dec0eccec8e5171dc0e26e6b03a6/project-request_access_button-large.png) |
| Medium | Large |
| ----------- | ------- |
| ![withdraw_access_request_button](/uploads/12be06f0a2bf9426a5e043f52c4d1dab/withdraw_access_request_button.png) | ![project-withdraw_access_request_button-large](/uploads/93fda7767ee5f02186c4c954ea346254/project-withdraw_access_request_button-large.png) |
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4860
(cherry picked from commit c578fb064c6a90cbaf60959d7706c0bcc34d87f5)
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/show.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 62ebd69485c..9e736e60065 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -15,6 +15,11 @@ %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } = visibility_level_icon(@group.visibility_level, fw: false) + .group-right-buttons.btn-group + - if current_user + .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @group + = render 'shared/notifications/button', notification_setting: @notification_setting + - if @group.description.present? .cover-desc.description = markdown(@group.description, pipeline: :description) |