Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: Gemfile.lock config/application.rb
2018-04-13 16:36:46 -05:00
parent a817f084ea 50529cbceb
commit ed490b781f
22 changed files with 334 additions and 267 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -350,7 +350,7 @@ class Status < ApplicationRecord
      self.in_reply_to_account_id = carried_over_reply_to_account_id
      self.conversation_id        = thread.conversation_id if conversation_id.nil?
    elsif conversation_id.nil?
-      create_conversation
+      self.conversation = Conversation.new
    end
  end