summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-03-14 11:25:22 +0100
committerMałgorzata Ksionek <meksionek@gmail.com>2019-03-14 11:25:28 +0100
commit87af5c1c839270cfc8eb85fa2355aebcb89992c3 (patch)
tree99fc83d44980824875c5a994553b3f1fbf1f0508
parentde97396f5b859ac45f2fdff145e25898c93d7242 (diff)
downloadgitlab-ce-show-groups-on-project-members-page.tar.gz
-rw-r--r--app/policies/project_policy.rb2
-rw-r--r--spec/policies/project_policy_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 61878516544..5b726765ee9 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -169,6 +169,7 @@ class ProjectPolicy < BasePolicy
enable :read_milestone
enable :read_project_snippet
enable :read_project_member
+ enable :read_project_group_member
enable :read_note
enable :create_project
enable :create_issue
@@ -178,7 +179,6 @@ class ProjectPolicy < BasePolicy
enable :award_emoji
enable :read_pages_content
enable :read_release
- enable :read_project_group_member
end
# These abilities are not allowed to admins that are not members of the project,
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index 68766afbe43..1236c0878ff 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -13,9 +13,9 @@ describe ProjectPolicy do
%i[
read_project read_board read_list read_wiki read_issue
read_project_for_iids read_issue_iid read_label
- read_milestone read_project_snippet read_project_member read_note
- create_project create_issue create_note upload_file create_merge_request_in
- award_emoji read_release read_project_group_member
+ read_milestone read_project_snippet read_project_member read_project_group_member
+ read_note create_project create_issue create_note upload_file create_merge_request_in
+ award_emoji read_release
]
end