diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 09:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 09:09:03 +0300 |
| commit | 10213bf3b26c3c21f7683471d35d1cd052c41e9c (patch) | |
| tree | 32d1c776e16f56e1fc7a2ad0d5550029c24a3473 /app/models/merge_request.rb | |
| parent | c60a1173018e93e6bf433f87cb726adc979d1c8a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 14aa6ac066e..6c32bdadfa8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -38,9 +38,6 @@ class MergeRequest < ApplicationRecord has_many :merge_request_context_commits has_many :merge_request_context_commit_diff_files, through: :merge_request_context_commits, source: :diff_files - has_many :merge_request_milestones - has_many :milestones, through: :merge_request_milestones - has_one :merge_request_diff, -> { order('merge_request_diffs.id DESC') }, inverse_of: :merge_request |