From 630e879066156e8593a8b42b531ef727227c60bf Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 17 Apr 2015 11:03:33 +0200
Subject: Clean up code somewhat.

---
 app/models/commit.rb            | 7 +++----
 app/models/concerns/issuable.rb | 9 ++++-----
 app/models/snippet.rb           | 6 ++----
 3 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'app/models')

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 6677dcb1e34..1cabc060c2a 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -139,15 +139,14 @@ class Commit
     users << author
     users << committer
     
-    mentions = []
-    mentions << self.mentioned_users(current_user, project)
+    users.push *self.mentioned_users(current_user, project)
 
     notes(project).each do |note|
       users << note.author
-      mentions << note.mentioned_users(current_user, project)
+      users.push *note.mentioned_users(current_user, project)
     end
 
-    users.concat(mentions.reduce([], :|)).uniq
+    users.uniq
   end
 
   def notes(project)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 1cad5894267..a21d9bdfe8a 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -122,16 +122,15 @@ module Issuable
     users = []
     users << author
     users << assignee if is_assigned?
-    
-    mentions = []
-    mentions << self.mentioned_users(current_user)
+
+    users.push *self.mentioned_users(current_user)
 
     notes.each do |note|
       users << note.author
-      mentions << note.mentioned_users(current_user)
+      users.push *note.mentioned_users(current_user)
     end
 
-    users.concat(mentions.reduce([], :|)).uniq
+    users.uniq
   end
 
   def subscribed?(user)
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 13703f4115f..c11c28805eb 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -90,15 +90,13 @@ class Snippet < ActiveRecord::Base
   def participants(current_user = self.author)
     users = []
     users << author
-
-    mentions = []
     
     notes.each do |note|
       users << note.author
-      mentions << note.mentioned_users(current_user)
+      users.push *note.mentioned_users(current_user)
     end
 
-    users.concat(mentions.reduce([], :|)).uniq
+    users.uniq
   end
 
   class << self
-- 
cgit v1.2.1