Commit 630e8790 authored by Douwe Maan's avatar Douwe Maan

Clean up code somewhat.

parent 990b476f
...@@ -139,15 +139,14 @@ class Commit ...@@ -139,15 +139,14 @@ class Commit
users << author users << author
users << committer users << committer
mentions = [] users.push *self.mentioned_users(current_user, project)
mentions << self.mentioned_users(current_user, project)
notes(project).each do |note| notes(project).each do |note|
users << note.author users << note.author
mentions << note.mentioned_users(current_user, project) users.push *note.mentioned_users(current_user, project)
end end
users.concat(mentions.reduce([], :|)).uniq users.uniq
end end
def notes(project) def notes(project)
......
...@@ -122,16 +122,15 @@ module Issuable ...@@ -122,16 +122,15 @@ module Issuable
users = [] users = []
users << author users << author
users << assignee if is_assigned? users << assignee if is_assigned?
mentions = [] users.push *self.mentioned_users(current_user)
mentions << self.mentioned_users(current_user)
notes.each do |note| notes.each do |note|
users << note.author users << note.author
mentions << note.mentioned_users(current_user) users.push *note.mentioned_users(current_user)
end end
users.concat(mentions.reduce([], :|)).uniq users.uniq
end end
def subscribed?(user) def subscribed?(user)
......
...@@ -90,15 +90,13 @@ class Snippet < ActiveRecord::Base ...@@ -90,15 +90,13 @@ class Snippet < ActiveRecord::Base
def participants(current_user = self.author) def participants(current_user = self.author)
users = [] users = []
users << author users << author
mentions = []
notes.each do |note| notes.each do |note|
users << note.author users << note.author
mentions << note.mentioned_users(current_user) users.push *note.mentioned_users(current_user)
end end
users.concat(mentions.reduce([], :|)).uniq users.uniq
end end
class << self class << self
......
...@@ -13,19 +13,21 @@ module Projects ...@@ -13,19 +13,21 @@ module Projects
end end
def participants_in(type, id) def participants_in(type, id)
users = case type users =
when "Issue" case type
issue = project.issues.find_by_iid(id) when "Issue"
issue ? issue.participants(current_user) : [] issue = project.issues.find_by_iid(id)
when "MergeRequest" issue.participants(current_user) if issue
merge_request = project.merge_requests.find_by_iid(id) when "MergeRequest"
merge_request ? merge_request.participants(current_user) : [] merge_request = project.merge_requests.find_by_iid(id)
when "Commit" merge_request.participants(current_user) if merge_request
commit = project.repository.commit(id) when "Commit"
commit ? commit.participants(project, current_user) : [] commit = project.repository.commit(id)
else commit.participants(project, current_user) if commit
[] end
end
return [] unless users
sorted(users) sorted(users)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment