diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-17 21:08:24 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-17 21:08:24 +0300 |
| commit | 726a414169e6c3219ff4fd410da3efd53fc7f912 (patch) | |
| tree | b3cb53c9bb0724aacbf2181911b2157c5abef67a /spec/models/user_spec.rb | |
| parent | e96ee2a22ba56a77fcec371313e25d3b3c93cff2 (diff) | |
| parent | d444fd3460e896065c21abda9a1cafa93f9315a5 (diff) | |
Merge branch 'chat-name-authorize' into 'master'
Allows to authorize chat user against GitLab.
This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438
See merge request !7450
Diffstat (limited to 'spec/models/user_spec.rb')
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 580ce4a9e0a..0994159e210 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -33,6 +33,7 @@ describe User, models: true do it { is_expected.to have_many(:award_emoji).dependent(:destroy) } it { is_expected.to have_many(:builds).dependent(:nullify) } it { is_expected.to have_many(:pipelines).dependent(:nullify) } + it { is_expected.to have_many(:chat_names).dependent(:destroy) } describe '#group_members' do it 'does not include group memberships for which user is a requester' do |