Merge branch 'master' into development

2016-12-22 11:35:00 +01:00
parent 80e02b90e4 3caf0cfb03
commit f91b6fa9e1
4 changed files with 9 additions and 3 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -168,6 +168,7 @@ class Status < ApplicationRecord

  before_validation do
    text.strip!
+    self.reblog = reblog.reblog if reblog? && reblog.reblog?
    self.in_reply_to_account_id = thread.account_id if reply?
    self.visibility             = :public if visibility.nil?
  end