summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-23 17:27:03 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-24 12:31:16 +0200
commit6f8ff08c65f954707cb426dace802a32a02a04f6 (patch)
tree3df28845dc47c57d9cc7d7a04753b28bcc4cc154
parent889832578afcf668a15deca1fe3c84b9498bcd1d (diff)
downloadgitlab-ce-6f8ff08c65f954707cb426dace802a32a02a04f6.tar.gz
Fix behavior for Enumerable-like ActiveRecord relations.
-rw-r--r--app/models/concerns/participable.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index f59dbc471ac..a01b28ea8db 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -32,12 +32,10 @@ module Participable
case value
when User
[value]
- when Array
+ when Enumerable, ActiveRecord::Relation
value.flat_map { |v| participants_for(v, current_user) }
when Participable
value.participants(current_user)
- when Mentionable
- value.mentioned_users(current_user)
end
end
end