deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes/api

Browse source
This commit is contained in:
Sebastian Ziebell 2013-02-14 17:02:16 +01:00
commit c8b92a4be2
22 changed files with 201 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/event_filter.rb
View file

@ -37,15 +37,15 @@ class EventFilter
filter = params.dup
actions = []
actions << Event::Pushed if filter.include? 'push'
actions << Event::Merged if filter.include? 'merged'
actions << Event::PUSHED if filter.include? 'push'
actions << Event::MERGED if filter.include? 'merged'
if filter.include? 'team'
actions << Event::Joined
actions << Event::Left
actions << Event::JOINED
actions << Event::LEFT
end
actions << Event::Commented if filter.include? 'comments'
actions << Event::COMMENTED if filter.include? 'comments'
events = events.where(action: actions)
end