Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00
parent f0a2a6c875 476e79b8e3
commit 8d6b9ba494
322 changed files with 8478 additions and 2587 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -136,6 +136,8 @@ class Status < ApplicationRecord

  after_create :store_uri, if: :local?

+  around_create Mastodon::Snowflake::Callbacks
+
  before_validation :prepare_contents, if: :local?
  before_validation :set_reblog
  before_validation :set_visibility