summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-22 18:32:08 +0200
committerRémy Coutable <remy@rymai.me>2016-05-10 19:07:46 +0200
commita278b36ab0f30e8bfa491256bddf9de1c0572382 (patch)
treeb4de48eba1c82af7c14b7604dddeaa43bd1b3267 /app/models/concerns
parent0cc8cee6cd58cfa8e34eccccb14fb146630f9cb7 (diff)
downloadgitlab-ce-a278b36ab0f30e8bfa491256bddf9de1c0572382.tar.gz
Fix an issue when filtering merge requests with more than one label
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/issuable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 7a3db742030..c1248b53031 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -124,8 +124,8 @@ module Issuable
end
def with_label(title)
- if title.is_a?(Array) && title.count > 1
- joins(:labels).where(labels: { title: title }).group('issues.id').having("count(distinct labels.title) = #{title.count}")
+ if title.is_a?(Array) && title.size > 1
+ joins(:labels).where(labels: { title: title }).group(arel_table[:id]).having("COUNT(DISTINCT labels.title) = #{title.size}")
else
joins(:labels).where(labels: { title: title })
end