Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-db

# Conflicts:
#   spec/models/group_spec.rb

1 files changed, 1 insertions, 0 deletions

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index eac3d962dd1..5d87938235a 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -14,6 +14,7 @@ describe Group, models: true do
     it { is_expected.to have_many(:notification_settings).dependent(:destroy) }
     it { is_expected.to have_many(:labels).class_name('GroupLabel') }
     it { is_expected.to have_many(:uploads).dependent(:destroy) }
+    it { is_expected.to have_one(:chat_team) }
 
     describe '#members & #requesters' do
       let(:requester) { create(:user) }