summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-12 09:23:21 +0200
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-12 09:23:21 +0200
commit7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (patch)
treeb39508df518df88682703b4525f6895113ec4a8a /app/models/concerns
parent2bbe781d8b45fb9677f5fbe60cf86b2452ef3af4 (diff)
downloadgitlab-ce-7a4e7ad04e1fc96953d9159e8e1a2208990d34f7.tar.gz
Fix tests and wrong choices during merge
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/issuable.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 9b77b88ca80..83d3bfe8e17 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -100,6 +100,14 @@ module Issuable
order_by(method)
end
end
+
+ def with_label(title)
+ 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
+ end
end
def today?