From b9bf23e07cf886825fc9b0038caae4bfd78d3c05 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 19 Sep 2016 11:16:43 +0530
Subject: [PATCH] Remove extraneous code that was previously added for
performance.
---
app/models/concerns/issuable.rb | 2 --
app/models/issue.rb | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 1c10ff9fa1b..6ed9216d666 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -29,8 +29,6 @@ module Issuable
end
end
- has_many :system_notes, -> { merge(Note.system) }, class_name: Note, as: :noteable, inverse_of: :noteable
-
has_many :label_links, as: :target, dependent: :destroy
has_many :labels, through: :label_links
has_many :todos, as: :target, dependent: :destroy
diff --git a/app/models/issue.rb b/app/models/issue.rb
index fd66a7a2714..371b3f4ee73 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -201,8 +201,8 @@ class Issue < ActiveRecord::Base
# From all notes on this issue, we'll select the system notes about linked
# merge requests. Of those, the MRs closing `self` are returned.
- def closed_by_merge_requests(current_user = nil, check_if_open: true)
- return [] if !open? && check_if_open
+ def closed_by_merge_requests(current_user = nil)
+ return [] if !open?
ext = all_references(current_user)
--
GitLab