From b43d3af782c52b060205e63720857bbf462d6b6e Mon Sep 17 00:00:00 2001 From: Timothy Andrew Date: Tue, 20 Sep 2016 11:20:51 +0530 Subject: Miscellaneous cycle-analytics-related changes. 1. Add indexes to `CreateMergeRequestsClosingIssues` columns. 2. Remove an extraneous `check_if_open` check that is redundant now. It would've been better to rebase this in, but that's not possible because more people are working on this branch. --- app/models/issue.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'app/models/issue.rb') diff --git a/app/models/issue.rb b/app/models/issue.rb index 371b3f4ee73..2403748d017 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -210,11 +210,7 @@ class Issue < ActiveRecord::Base note.all_references(current_user, extractor: ext) end - if check_if_open - ext.merge_requests.select { |mr| mr.open? && mr.closes_issue?(self) } - else - ext.merge_requests.select { |mr| mr.closes_issue?(self) } - end + ext.merge_requests.select { |mr| mr.open? && mr.closes_issue?(self) } end def moved? -- cgit v1.2.1