summaryrefslogtreecommitdiff
path: root/lib/event_filter.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-18 19:00:14 +0000
commit05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch)
tree11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /lib/event_filter.rb
parentec73467c23693d0db63a797d10194da9e72a74af (diff)
downloadgitlab-ce-05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2.tar.gz
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'lib/event_filter.rb')
-rw-r--r--lib/event_filter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index f14b0a6b9e7..ed14affda71 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -38,7 +38,7 @@ class EventFilter
when TEAM
events.where(action: Event::TEAM_ACTIONS)
when ISSUE
- events.where(action: Event::ISSUE_ACTIONS, target_type: 'Issue')
+ events.where(action: Event::ISSUE_ACTIONS).for_issue
when WIKI
wiki_events(events)
when DESIGNS
@@ -97,7 +97,7 @@ class EventFilter
when ISSUE
in_operator_params(
array_data: array_data,
- scope: Event.where(target_type: Issue.name),
+ scope: Event.for_issue,
in_column: :action,
in_values: Event.actions.values_at(*Event::ISSUE_ACTIONS)
)