summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCallum Dryden <callum.dryden@rightscale.com>2016-10-06 15:19:27 +0000
committerCallum Dryden <callum.dryden@rightscale.com>2016-10-20 00:26:45 +0000
commit9124310f2871117acaac98781be84c9fc016e2ad (patch)
tree3bb94c532a5f52dc27f483ab6de0a829f6831c19 /lib
parentc08435e3c25f0a7a705ed8a49b16dde176b41a40 (diff)
downloadgitlab-ce-9124310f2871117acaac98781be84c9fc016e2ad.tar.gz
Differentiate the expire from leave event
At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.
Diffstat (limited to 'lib')
-rw-r--r--lib/event_filter.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index 96e70e37e8f..21f6a9a762b 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -45,9 +45,16 @@ class EventFilter
when EventFilter.comments
actions = [Event::COMMENTED]
when EventFilter.team
- actions = [Event::JOINED, Event::LEFT]
+ actions = [Event::JOINED, Event::LEFT, Event::EXPIRED]
when EventFilter.all
- actions = [Event::PUSHED, Event::MERGED, Event::COMMENTED, Event::JOINED, Event::LEFT]
+ actions = [
+ Event::PUSHED,
+ Event::MERGED,
+ Event::COMMENTED,
+ Event::JOINED,
+ Event::LEFT,
+ Event::EXPIRED
+ ]
end
events.where(action: actions)