summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-25 16:46:06 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-25 16:46:06 -0400
commit07a88040a405cd1a72baa63c9439c25c513636ae (patch)
tree2c5f7ec1eeaf7105db497e6f74ab2a87f61c89f0 /lib
parent682ec038ac686cd8e0e7161a4a576dc764b61b11 (diff)
downloadgitlab-ce-07a88040a405cd1a72baa63c9439c25c513636ae.tar.gz
Fix NotificationService spec
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/markdown/reference_filter.rb6
-rw-r--r--lib/gitlab/markdown/user_reference_filter.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index 2e8baea68d6..42eadf450c7 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -41,10 +41,10 @@ module Gitlab
#
# type - Singular Symbol reference type (e.g., :issue, :user, etc.)
# value - Object to add
- def push_result(type, value)
- return if value.nil?
+ def push_result(type, *values)
+ return if values.empty?
- result[:references][type].push(value)
+ result[:references][type].push(*values)
end
def reference_class(type)
diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index d3af206335d..b4c48d29684 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -45,7 +45,7 @@ module Gitlab
if user == 'all'
# FIXME (rspeicher): Law of Demeter
- push_result(:user, project.team.members.flatten)
+ push_result(:user, *project.team.members.flatten)
url = link_to_all(project)
@@ -53,7 +53,7 @@ module Gitlab
elsif namespace = Namespace.find_by(path: user)
if namespace.is_a?(Group)
if user_can_reference_group?(namespace)
- push_result(:user, namespace.users)
+ push_result(:user, *namespace.users)
url = group_url(user, only_path: context[:only_path])
%(<a href="#{url}" class="#{klass}">@#{user}</a>)