Merge branch 'main' into glitch-soc/merge-upstream

2021-02-03 17:02:48 +01:00
parent 7632255115 4e933924bd
commit 4d40685850
33 changed files with 453 additions and 319 deletions
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@ -353,10 +353,6 @@ describe ApplicationController, type: :controller do
      expect(C.new.cache_collection(raw, Object)).to eq raw
    end

-    context 'Notification' do
-      include_examples 'cacheable', :notification, Notification
-    end
-
    context 'Status' do
      include_examples 'cacheable', :status, Status
    end