Tweaked performance of Issue#related_branches

Requesting the branch names of a repository works even when it's empty, thus there's no need to explicitly check for an empty repository. Removing this check cuts down the amount of Git operations which in turn cuts down request timings a bit. The regular expression used to compare branches was also moved out of the loop so it's created only once.

Tweaked performance of Issue#related_branches
41b8d226 · Yorick Peterse · 3f22a92f · 41b8d226 · 41b8d226
Commit 41b8d226 authored Mar 18, 2016 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

issue.rb app/models/issue.rb +3 -3

issue_spec.rb spec/models/issue_spec.rb +2 -2

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -105,9 +105,9 @@ class Issue < ActiveRecord::Base
  end
  def related_branches
-    return [] if self.project.empty_repo?
+    project.repository.branch_names.select do |branch|
+      branch.end_with?("-#{iid}")
-    self.project.repository.branch_names.select { |branch| branch.end_with?("-#{iid}") }
+    end
  end
  # Reset issue events cache

--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -133,9 +133,9 @@ describe Issue, models: true do
  describe '#related_branches' do
    it "selects the right branches" do
      allow(subject.project.repository).to receive(:branch_names).
-                                    and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
+        and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
-      expect(subject.related_branches).to eq [subject.to_branch_name]
+      expect(subject.related_branches).to eq([subject.to_branch_name])
    end
  end