From 6f8b9a16f508935ad23c42402440bb269e12e071 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@mcgivern.me.uk>
Date: Mon, 21 Aug 2017 14:34:21 +0000
Subject: Merge branch 'sh-fix-atom-feeds' into 'master'

Fix 500 errors in Atom feeds due to push events

Closes #36705

See merge request !13695
---
 app/models/event.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'app')

diff --git a/app/models/event.rb b/app/models/event.rb
index f2a560a6b56..15ee170ca75 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -83,6 +83,10 @@ class Event < ActiveRecord::Base
   self.inheritance_column = 'action'
 
   class << self
+    def model_name
+      ActiveModel::Name.new(self, nil, 'event')
+    end
+
     def find_sti_class(action)
       if action.to_i == PUSHED
         PushEvent
@@ -438,6 +442,12 @@ class Event < ActiveRecord::Base
     EventForMigration.create!(new_attributes)
   end
 
+  def to_partial_path
+    # We are intentionally using `Event` rather than `self.class` so that
+    # subclasses also use the `Event` implementation.
+    Event._to_partial_path
+  end
+
   private
 
   def recent_update?
-- 
cgit v1.2.3