diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-07-30 15:52:42 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-08-06 11:58:22 -0300 |
commit | fdb5f285f924e653400f7bbe18d13718c469d74f (patch) | |
tree | 3570730544d21c8d463aed792e9adcd686ea436a /app/models | |
parent | cb2e07309b4e61501a44c3568155bdb73252338f (diff) | |
download | gitlab-ce-fdb5f285f924e653400f7bbe18d13718c469d74f.tar.gz |
Retrieve merge request closing issues from database cache
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request.rb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b4090fd8baf..e390ab8ddf9 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -52,6 +52,8 @@ class MergeRequest < ActiveRecord::Base class_name: 'MergeRequestsClosingIssues', dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent + has_many :cached_closes_issues, through: :merge_requests_closing_issues, source: :issue + belongs_to :assignee, class_name: "User" serialize :merge_params, Hash # rubocop:disable Cop/ActiveRecordSerialize @@ -755,8 +757,9 @@ class MergeRequest < ActiveRecord::Base # Calculating this information for a number of merge requests requires # running `ReferenceExtractor` on each of them separately. # This optimization does not apply to issues from external sources. - def cache_merge_request_closes_issues!(current_user) + def cache_merge_request_closes_issues!(current_user = self.author) return unless project.issues_enabled? + return if closed? || merged? transaction do self.merge_requests_closing_issues.delete_all @@ -769,6 +772,18 @@ class MergeRequest < ActiveRecord::Base end end + def visible_closing_issues_for(current_user = self.author) + strong_memoize(:visible_closing_issues_for) do + if self.target_project.has_external_issue_tracker? + closes_issues(current_user) + else + cached_closes_issues.select do |issue| + Ability.allowed?(current_user, :read_issue, issue) + end + end + end + end + # Return the set of issues that will be closed if this merge request is accepted. def closes_issues(current_user = self.author) if target_branch == project.default_branch @@ -788,7 +803,7 @@ class MergeRequest < ActiveRecord::Base ext = Gitlab::ReferenceExtractor.new(project, current_user) ext.analyze("#{title}\n#{description}") - ext.issues - closes_issues(current_user) + ext.issues - visible_closing_issues_for(current_user) end def target_project_path @@ -836,7 +851,7 @@ class MergeRequest < ActiveRecord::Base end def merge_commit_message(include_description: false) - closes_issues_references = closes_issues.map do |issue| + closes_issues_references = visible_closing_issues_for.map do |issue| issue.to_reference(target_project) end |