Use reverse_merge on Label#issues_count and Label#merge_requests_count

5912251e · Douglas Barbosa Alexandre · da940792 · 5912251e
Commit 5912251e authored Oct 13, 2016 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/label.rb app/models/label.rb +2 -2

No files found.
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -128,13 +128,13 @@ class Label < ActiveRecord::Base
  end

  def issues_count(user, params = {})
-    IssuesFinder.new(user, { label_name: title, scope: 'all' }.merge(params))
+    IssuesFinder.new(user, params.reverse_merge(label_name: title, scope: 'all'))
                .execute
                .count
  end

  def merge_requests_count(user, params = {})
-    MergeRequestsFinder.new(user, { label_name: title, scope: 'all' }.merge(params))
+    MergeRequestsFinder.new(user, params.reverse_merge(label_name: title, scope: 'all'))
                       .execute
                       .count
  end