diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/event_filter.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/event_filter.rb')
-rw-r--r-- | lib/event_filter.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/event_filter.rb b/lib/event_filter.rb index 8cb0b1441df..538727dc422 100644 --- a/lib/event_filter.rb +++ b/lib/event_filter.rb @@ -27,15 +27,15 @@ class EventFilter case filter when PUSH - events.where(action: Event::PUSHED) + events.pushed_action when MERGED - events.where(action: Event::MERGED) + events.merged_action when COMMENTS - events.where(action: Event::COMMENTED) + events.commented_action when TEAM - events.where(action: [Event::JOINED, Event::LEFT, Event::EXPIRED]) + events.where(action: [:joined, :left, :expired]) when ISSUE - events.where(action: [Event::CREATED, Event::UPDATED, Event::CLOSED, Event::REOPENED], target_type: 'Issue') + events.where(action: [:created, :updated, :closed, :reopened], target_type: 'Issue') when WIKI wiki_events(events) else |