diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 15:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 15:07:52 +0000 |
| commit | 27d91a629918e417a9e87825e838209b9ace79c1 (patch) | |
| tree | e066c3fc84e3011641e662252810cb2c240edb90 /spec/models/merge_request_spec.rb | |
| parent | 5e11c9b77cb1b2b77ee29359047b55807afe255d (diff) | |
| download | gitlab-ce-27d91a629918e417a9e87825e838209b9ace79c1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index bec817f2416..72e8294e237 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -17,6 +17,7 @@ describe MergeRequest do it { is_expected.to belong_to(:merge_user).class_name("User") } it { is_expected.to have_many(:assignees).through(:merge_request_assignees) } it { is_expected.to have_many(:merge_request_diffs) } + it { is_expected.to have_many(:user_mentions).class_name("MergeRequestUserMention") } context 'for forks' do let!(:project) { create(:project) } |