diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 12:10:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-03 12:10:37 +0300 |
| commit | 058bd6be52a5e68ea81f9026201b1136610336b1 (patch) | |
| tree | 82681bd6b793ca4d7208fc4fb4f49c47d77dd1f3 /app/policies | |
| parent | bbc0882f5730aff94a0739a481b42143708949c2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/incident_management/timeline_event_tag_policy.rb | 7 | ||||
| -rw-r--r-- | app/policies/project_policy.rb | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/policies/incident_management/timeline_event_tag_policy.rb b/app/policies/incident_management/timeline_event_tag_policy.rb new file mode 100644 index 00000000000..e2268d917b4 --- /dev/null +++ b/app/policies/incident_management/timeline_event_tag_policy.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module IncidentManagement + class TimelineEventTagPolicy < ::BasePolicy + delegate { @subject.project } + end +end diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index c71b26987a0..b0818d1de6c 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -254,7 +254,6 @@ class ProjectPolicy < BasePolicy enable :change_namespace enable :change_visibility_level - enable :rename_project enable :remove_project enable :archive_project enable :remove_fork_project @@ -497,6 +496,7 @@ class ProjectPolicy < BasePolicy enable :push_to_delete_protected_branch enable :update_snippet enable :admin_snippet + enable :rename_project enable :admin_project_member enable :admin_note enable :admin_wiki @@ -846,6 +846,10 @@ class ProjectPolicy < BasePolicy enable :view_package_registry_project_settings end + rule { can?(:read_project) }.policy do + enable :read_incident_management_timeline_event_tag + end + private def user_is_user? |