Extract sorting into a method.

2 files changed, 12 insertions, 9 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 353d4f0c4b6..30196f9da3a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -130,14 +130,13 @@ class ProjectsController < ApplicationController
     else
       []
     end
-    team_members = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
+    team_members = sorted(@project.team.members)
     participants = team_members + participating
-    #participating = @project.issues.map { |issue| issue.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } }.flatten
     @suggestions = {
       emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } },
       issues: @project.issues.select([:iid, :title, :description]),
       mergerequests: @project.merge_requests.select([:iid, :title, :description]),
-      members: participants.uniq
+      members: participants
     }
 
     respond_to do |format|
@@ -174,14 +173,19 @@ class ProjectsController < ApplicationController
   end
 
   def participants_in(type, id)
-    note = case type
+    users = case type
     when "Issue", "MergeRequest"
-      type.constantize.find_by_iid(id)
-    when "Commits"
-      type.constantize.find(id)
+      type.constantize.find_by_iid(id).participants
+    when "Commit"
+      author_ids = Note.for_commit_id(id).pluck(:author_id).uniq
+      User.where(id: author_ids)
     else
       []
     end
-    note.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
+    sorted(users)
+  end
+
+  def sorted(users)
+    users.uniq.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 99ebf1527bf..d9f420759d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -169,7 +169,6 @@ class User < ActiveRecord::Base
   scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all }
   scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)') }
   scope :ldap, -> { where(provider:  'ldap') }
-  scope :participating, ->(notes){ where(id: notes.inc_author.map(&:author_id))}
 
   scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active  }