Merge branch 'release/1.2.1' into develop

2020-03-08 22:15:58 +05:30 · 2020-03-08 22:15:58 +05:30 · 1db35caa56
commit 1db35caa56
parent 60dc564f37 2a4fb7b056
27 changed files with 235 additions and 111 deletions
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@ -226,6 +226,7 @@ RSpec.describe Conversation, type: :model do
    let(:conversation) { create(:conversation) }
    let(:expected_data) do
      {
+        additional_attributes: nil,
        meta: {
          sender: conversation.contact.push_event_data,
          assignee: conversation.assignee