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 /app/models/merge_request.rb | |
| parent | 5e11c9b77cb1b2b77ee29359047b55807afe255d (diff) | |
| download | gitlab-ce-27d91a629918e417a9e87825e838209b9ace79c1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f4dfd9128fa..240c143abba 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -71,6 +71,7 @@ class MergeRequest < ApplicationRecord has_many :merge_request_assignees has_many :assignees, class_name: "User", through: :merge_request_assignees + has_many :user_mentions, class_name: "MergeRequestUserMention" has_many :deployment_merge_requests |