diff options
author | Phil Hughes <me@iamphill.com> | 2017-02-16 09:34:13 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-02-16 09:40:38 +0000 |
commit | 3894ae3bd07550bef632068f6d5296144099f619 (patch) | |
tree | 9ed20600dac7f7ccbe4e41dcacb63a0f3e9f1391 | |
parent | 93ae3063ad0455a0bd6b9994f718d20357a31e28 (diff) | |
download | gitlab-ce-group-memebrs-owner-level.tar.gz |
Added ability to change user permissions in group to ownergroup-memebrs-owner-level
Closes #28233
-rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/group-memebrs-owner-level.yml | 4 | ||||
-rw-r--r-- | spec/features/groups/members/list_spec.rb | 15 |
3 files changed, 20 insertions, 1 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 239387fc9fa..8e721c9c8dd 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -61,7 +61,7 @@ = dropdown_title("Change permissions") .dropdown-content %ul - - Gitlab::Access.options.each do |role, role_id| + - member.class.access_level_roles.each do |role, role_id| %li = link_to role, "javascript:void(0)", class: ("is-active" if member.access_level == role_id), diff --git a/changelogs/unreleased/group-memebrs-owner-level.yml b/changelogs/unreleased/group-memebrs-owner-level.yml new file mode 100644 index 00000000000..ba77f38eb6d --- /dev/null +++ b/changelogs/unreleased/group-memebrs-owner-level.yml @@ -0,0 +1,4 @@ +--- +title: Added option to update to owner for group members +merge_request: +author: diff --git a/spec/features/groups/members/list_spec.rb b/spec/features/groups/members/list_spec.rb index 109de39b2dd..14c193f7450 100644 --- a/spec/features/groups/members/list_spec.rb +++ b/spec/features/groups/members/list_spec.rb @@ -30,6 +30,21 @@ feature 'Groups members list', feature: true do expect(second_row).to be_blank end + it 'updates user to owner level', :js do + group.add_owner(user1) + group.add_developer(user2) + + visit group_group_members_path(group) + + page.within(second_row) do + click_button('Developer') + + click_link('Owner') + + expect(page).to have_button('Owner') + end + end + def first_row page.all('ul.content-list > li')[0] end |