diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-12 12:26:16 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-12 12:26:16 +0300 |
| commit | 59f81b4ff80862fb7649eba461ba588d6cfee9ec (patch) | |
| tree | cbcdf0feb8ebac576a43cfc5595ffa20118b80a1 | |
| parent | c43f7d4713a719d7090d7ec5fbe4a36d233282ad (diff) | |
| parent | 0424f3fa73259719ecb409eeafaf732b74739916 (diff) | |
Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'
Hide new subgroup button if user has no permission to create one
Closes #30139
See merge request !10627
| -rw-r--r-- | app/policies/group_policy.rb | 1 | ||||
| -rw-r--r-- | app/views/groups/subgroups.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/siemens-gitlab-ce-fix-subgroup-hide-button.yml | 4 | ||||
| -rw-r--r-- | spec/policies/group_policy_spec.rb | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index cb58c115d54..87398303c68 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -28,6 +28,7 @@ class GroupPolicy < BasePolicy can! :admin_namespace can! :admin_group_member can! :change_visibility_level + can! :create_subgroup if @user.can_create_group end if globally_viewable && @subject.request_access_enabled && !member diff --git a/app/views/groups/subgroups.html.haml b/app/views/groups/subgroups.html.haml index be809083139..8f0724c0677 100644 --- a/app/views/groups/subgroups.html.haml +++ b/app/views/groups/subgroups.html.haml @@ -9,7 +9,7 @@ .nav-controls = form_tag request.path, method: :get do |f| = search_field_tag :filter_groups, params[:filter_groups], placeholder: 'Filter by name', class: 'form-control', spellcheck: false - - if can? current_user, :admin_group, @group + - if can?(current_user, :create_subgroup, @group) = link_to new_group_path(parent_id: @group.id), class: 'btn btn-new pull-right' do New Subgroup diff --git a/changelogs/unreleased/siemens-gitlab-ce-fix-subgroup-hide-button.yml b/changelogs/unreleased/siemens-gitlab-ce-fix-subgroup-hide-button.yml new file mode 100644 index 00000000000..716311c7582 --- /dev/null +++ b/changelogs/unreleased/siemens-gitlab-ce-fix-subgroup-hide-button.yml @@ -0,0 +1,4 @@ +--- +title: Hide new subgroup button if user has no permission to create one +merge_request: 10627 +author: diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index 5c34ff04152..2077c14ff7a 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -22,7 +22,8 @@ describe GroupPolicy, models: true do :admin_group, :admin_namespace, :admin_group_member, - :change_visibility_level + :change_visibility_level, + :create_subgroup ] end |