diff options
Diffstat (limited to 'app/models/event_collection.rb')
| -rw-r--r-- | app/models/event_collection.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/event_collection.rb b/app/models/event_collection.rb index 4c178e27b75..6c268bf6c36 100644 --- a/app/models/event_collection.rb +++ b/app/models/event_collection.rb @@ -45,9 +45,10 @@ class EventCollection private def apply_feature_flags(events) - return events if ::Feature.enabled?(:wiki_events) + events = events.not_wiki_page unless ::Feature.enabled?(:wiki_events) + events = events.not_design unless ::Feature.enabled?(:design_activity_events) - events.not_wiki_page + events end def project_events |