diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 13:35:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 13:35:05 +0000 |
| commit | 394fe7614c3d8507b79ca41419f11bcde906ccae (patch) | |
| tree | c6ea3084085d581edf8a2f9079850897e55741cc /app/views | |
| parent | 907bbb2b05860be401c77b305721b35a2850ea71 (diff) | |
| parent | 85de253ee10aa7821a212270a1940c6205533d38 (diff) | |
| download | gitlab-ce-394fe7614c3d8507b79ca41419f11bcde906ccae.tar.gz | |
Merge branch 'leave-group' into 'master'
User should be able to leave group. If not - show him proper message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !743
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/dashboard/groups/index.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index 5ecd53cff84..cfb386e131f 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -23,10 +23,9 @@ %i.fa.fa-cogs Settings - - if can?(current_user, :destroy_group_member, group_member) - = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Remove user from group' do - %i.fa.fa-sign-out - Leave + = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do + %i.fa.fa-sign-out + Leave = image_tag group_icon(group), class: "avatar s40 avatar-tile" = link_to group, class: 'group-name' do |