diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-13 17:22:11 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 14:58:26 -0200 |
| commit | 5912251e614421b4798ac235c7f408a1b45a2b4c (patch) | |
| tree | 4bd4529b13e20ea0acd4ca4f5e991b4af0d8abce | |
| parent | da9407927be1dd4a6b0b00be360e61d6bb507da8 (diff) | |
| download | gitlab-ce-5912251e614421b4798ac235c7f408a1b45a2b4c.tar.gz | |
Use reverse_merge on Label#issues_count and Label#merge_requests_count
| -rw-r--r-- | app/models/label.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index 444f45fa09e..112d9f3fbe5 100644 --- 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 |