Merge branch 'master' into glitch-soc/master

Conflicts: config/routes.rb Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
parent c789181626 f06fa09962
commit 8b4abaa90d
41 changed files with 215 additions and 78 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -26,8 +26,6 @@
 #

 class Status < ApplicationRecord
-  self.cache_versioning = false
-
  include Paginable
  include Streamable
  include Cacheable