diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-28 09:59:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-28 09:59:34 +0000 |
| commit | 3b9eb5631fa17bbf525b5e869d8e36665638cd5a (patch) | |
| tree | f68e1f71a10d071a10a5dda577f15da249ab4c09 /app/policies | |
| parent | e78f5bf8d67b6c37266dc486bc645e209384087f (diff) | |
| parent | 0f269f9c99e72e082fef6283387366b2831702d8 (diff) | |
| download | gitlab-ce-3b9eb5631fa17bbf525b5e869d8e36665638cd5a.tar.gz | |
Merge branch 'fldubois/gitlab-ce-fix-api-group-createdat' into 'master'
Allow date parameters on Issues, Notes, and Discussions API for group owners
Closes #40059
See merge request gitlab-org/gitlab-ce!21342
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/group_policy.rb | 2 | ||||
| -rw-r--r-- | app/policies/project_policy.rb | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index 333643865e9..73c93b22c95 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -72,6 +72,8 @@ class GroupPolicy < BasePolicy enable :admin_namespace enable :admin_group_member enable :change_visibility_level + + enable :set_note_created_at end rule { can?(:read_nested_project_resources) }.policy do diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index 00c58f15013..fd6cc504a3b 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -143,6 +143,10 @@ class ProjectPolicy < BasePolicy enable :destroy_merge_request enable :destroy_issue enable :remove_pages + + enable :set_issue_iid + enable :set_issue_created_at + enable :set_note_created_at end rule { can?(:guest_access) }.policy do |