Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
5912251e
Commit
5912251e
authored
Oct 13, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use reverse_merge on Label#issues_count and Label#merge_requests_count
parent
da940792
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/label.rb
app/models/label.rb
+2
-2
No files found.
app/models/label.rb
View file @
5912251e
...
@@ -128,13 +128,13 @@ class Label < ActiveRecord::Base
...
@@ -128,13 +128,13 @@ class Label < ActiveRecord::Base
end
end
def
issues_count
(
user
,
params
=
{})
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
.
execute
.
count
.
count
end
end
def
merge_requests_count
(
user
,
params
=
{})
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
.
execute
.
count
.
count
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment