Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/app/finders/events_finder.rb b/app/finders/events_finder.rb
index 7755cbdf9e5..9c56451fd44 100644
--- a/app/finders/events_finder.rb
+++ b/app/finders/events_finder.rb
@@ -52,10 +52,17 @@ class EventsFinder
     if current_user && scope == 'all'
       EventCollection.new(current_user.authorized_projects).all_project_events
     else
-      source.events
+      # EventCollection is responsible for applying the feature flag
+      apply_feature_flags(source.events)
     end
   end
 
+  def apply_feature_flags(events)
+    return events if ::Feature.enabled?(:wiki_events)
+
+    events.not_wiki_page
+  end
+
   # rubocop: disable CodeReuse/ActiveRecord
   def by_current_user_access(events)
     events.merge(Project.public_or_visible_to_user(current_user))