Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/app/models/event_collection.rb b/app/models/event_collection.rb
index 4778f74568e..4768506b8fa 100644
--- a/app/models/event_collection.rb
+++ b/app/models/event_collection.rb
@@ -30,17 +30,24 @@ class EventCollection
     relation = if groups
                  project_and_group_events
                else
-                 relation_with_join_lateral('project_id', projects)
+                 project_events
                end
 
     relation = paginate_events(relation)
     relation.with_associations.to_a
   end
 
+  def all_project_events
+    Event.from_union([project_events]).recent
+  end
+
   private
 
+  def project_events
+    relation_with_join_lateral('project_id', projects)
+  end
+
   def project_and_group_events
-    project_events = relation_with_join_lateral('project_id', projects)
     group_events = relation_with_join_lateral('group_id', groups)
 
     Event.from_union([project_events, group_events]).recent