--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -1,16 +1,4 @@
-module RepositoriesHelper
-  # Returns a Hash {email => user}
-  def self.users_by_commits(commits)
-    emails = commits.map { |commit| commit.committer.email }
-    users = User.find(:all, :conditions => ["email in (?)", emails])
-    email_user = {}
-    users.each { |user|
-      email_user[user.email] = user
-    }
-    
-    email_user
-  end
-  
+module RepositoriesHelper  
   def log_path(objectish = "master", options = {})
     if options.blank? # just to avoid the ? being tacked onto the url
       project_repository_log_path(@project, @repository, objectish)

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -212,6 +212,15 @@ class Repository < ActiveRecord::Base
       hash
     end
   end
+  
+  # Returns a Hash {email => user}, where email is selected from the +commits+
+  def users_by_commits(commits)
+    emails = commits.map { |commit| commit.committer.email }.uniq
+    users = User.find(:all, :conditions => ["email in (?)", emails])
+    
+    users_by_email = users.inject({}){|hash, user| hash[user.email] = user; hash }
+    users_by_email
+  end
     
   protected
     def set_as_mainline_if_first

--- a/app/views/logs/_log.html.erb
+++ b/app/views/logs/_log.html.erb
@@ -1,7 +1,7 @@
-<%  email_user = RepositoriesHelper.users_by_commits(@commits) %>
+<% users_by_email = @repository.users_by_commits(@commits) %>
 <ul class="commit_list">
 <% @commits.each do |commit| -%>
-<% user = email_user[commit.committer.email] %>
+<% user = users_by_email[commit.committer.email] %>
 <li class="commit_item">
   <div>
   <a href=""><%= link_to h(commit.id_abbrev), 

--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -36,11 +36,8 @@
     <th></th>
     <th></th>
   </thead>
-  <% commits = [] %>
   <% repositories = @repositories.sort_by { |e| if e.last_commit then commits << e.last_commit; e.mainline? ? Time.now : e.last_commit.committed_date; else Time.at(0); end } %>
-  <% email_user = RepositoriesHelper.users_by_commits(commits) %>
   <% repositories.reverse_each do |repos| # FIXME: need to graph the parent relation proper -%>
-    <% user = email_user[repos.last_commit.committer.email] if repos.has_commits? %>
     <tr class="<%= cycle("even", "odd") -%> <%= repos.mainline? ? "mainline" : "clone" -%>">
       <td class="name">
         <%= link_to h(repos.name), project_repository_path(@project, repos) -%>

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -257,6 +257,17 @@ describe Repository do
     @repository.count_commits_from_last_week_by_user(users(:johan)).should == 0
   end
   
+  it "returns a set of users from a list of commits" do
+    commits = []
+    users(:johan, :moe).map(&:email).each do |email|
+      committer = OpenStruct.new(:email => email)
+      commits << OpenStruct.new(:committer => committer)
+    end
+    users = @repository.users_by_commits(commits)
+    users.keys.sort.should == users(:johan, :moe).map(&:email).sort
+    users.values.map(&:login).sort.should == users(:johan, :moe).map(&:login).sort
+  end
+  
   describe "observers" do
     it "sends an email to the admin if there's a parent" do
       Mailer.should_receive(:deliver_new_repository_clone).with(@repository).and_return(true)