diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-01 10:33:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-01 10:33:27 +0000 |
| commit | 1c50200b9aba86d2ba66b81dee7886a51dc38409 (patch) | |
| tree | 89bdb19c96a801386f886fcb27eff1e43fb4371e /app | |
| parent | 1431ccc010918f34a4834477261b468323bbd939 (diff) | |
| parent | d4ef4ad752bf05758351bd0b8761566e40ab0e8e (diff) | |
| download | gitlab-ce-1c50200b9aba86d2ba66b81dee7886a51dc38409.tar.gz | |
Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'
Reduce SQL queries needed to load open merge requests
See merge request gitlab-org/gitlab-ce!22709
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d593cbb223a..106cb92e0cc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -181,7 +181,7 @@ class Project < ActiveRecord::Base has_one :import_export_upload, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent # Merge Requests for target project should be removed with it - has_many :merge_requests, foreign_key: 'target_project_id' + has_many :merge_requests, foreign_key: 'target_project_id', inverse_of: :target_project has_many :source_of_merge_requests, foreign_key: 'source_project_id', class_name: 'MergeRequest' has_many :issues has_many :labels, class_name: 'ProjectLabel' |