--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,10 @@
 events:
 * need to create user-less events even we don't find matching users, otherwise it gets weird whenever there's commits from non-registered gitorious users (or users commit from another email).
 - maybe save name+email in events table in that case, so we can hook them up to a user later if needed.
+* .hooks symlink need to go to $deploy_to/current, not the release dir
 
 new-ui:
+* show outstanding mergerequests on dashboard
 * mandatory project descriptions, at least a sentence or two
 * tweak fonts-sizes and line-heights
 * Clone stats graph on repositories#index

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -86,7 +86,7 @@ class ProjectsController < ApplicationController
     if @project.can_be_deleted_by?(current_user)
       project_title = @project.title
       @project.destroy
-      #current_user.create_event(Action::DELETE_PROJECT, nil, project_title)
+#       Event.create(:action => Action::DELETE_PROJECT, :user => current_user, :data => project_title) # FIXME: project_id cannot be null
     else
       flash[:error] = "You're not the owner of this project, or the project has clones"
     end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -143,7 +143,7 @@ module ApplicationHelper
         
         project = target.project
         
-        action = "<strong>forked</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>cloned</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}"
         category = "repository"
       when Action::DELETE_REPOSITORY
         action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}"
@@ -156,42 +156,42 @@ module ApplicationHelper
       when Action::CREATE_BRANCH
         project = target.project
         if event.data == "master"
-          action = "<strong>started development</strong> of #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+          action = "<strong>started development</strong> of #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
           body = event.body
         else
-          action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+          action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         end
         category = "commit"
       when Action::DELETE_BRANCH
         project = target.project
-        action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         category = "commit"
       when Action::CREATE_TAG
         project = target.project
-        action = "<strong>tagged</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>tagged</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         body = "#{link_to event.data, project_repository_commit_path(project, target, event.data)}<br/>#{event.body}"
         category = "commit"
       when Action::DELETE_TAG
         project = target.project
-        action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         category = "commit"
       when Action::ADD_COMMITTER
         user = target.user
         repo = target.repository
-        action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.title), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}"
+        action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.slug), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}"
         category = "repository"
       when Action::REMOVE_COMMITTER
         user = User.find_by_id(event.data.to_i)
         next unless user
         
         project = target.project
-        action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         category = "repository"
       when Action::COMMENT
         project = target.project
         repo = target.repository
         
-        action = "<strong>commented</strong> on #{link_to h(project.title), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}"
+        action = "<strong>commented</strong> on #{link_to h(project.slug), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}"
         body = truncate(h(target.body), 150)
         category = "comment"
       when Action::REQUEST_MERGE
@@ -199,15 +199,16 @@ module ApplicationHelper
         project = source_repository.project
         target_repository = target.target_repository
         
-        action = "<strong>requested merge</strong> #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} to #{link_to h(project.title), project_path(project)}/#{link_to h(target_repository.name)}"
-        body = "#{link_to "review", [project, target_repository, target]}<br/>#{truncate(h(target.proposal), 100)}"
-        category = "merge request"
+        action = "<strong>requested a merge of</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} with #{link_to h(project.slug), project_path(project)}/#{link_to h(target_repository.name)}"
+        body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
+        category = "merge_request"
       when Action::RESOLVE_MERGE_REQUEST
         source_repository = target.source_repository
         project = source_repository.project
         target_repository = target.target_repository
         
-        action = "<strong>resolved merge request </strong>to [#{target.status_string}] from #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+        action = "<strong>resolved merge request</strong> as [#{target.status_string}] from #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+        body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
         category = "merge_request"
       when Action::UPDATE_MERGE_REQUEST
         source_repository = target.source_repository
@@ -219,7 +220,7 @@ module ApplicationHelper
       when Action::DELETE_MERGE_REQUEST
         project = target.project
         
-        action = "<strong>deleted merge request</strong> from #{link_to h(project.title), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        action = "<strong>deleted merge request</strong> from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
         category = "merge_request"
     end
       

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -9,7 +9,7 @@ class Project < ActiveRecord::Base
     :class_name => "Repository"
   has_many    :repository_clones, :conditions => ["mainline = ?", false],
     :class_name => "Repository"
-  has_many    :events, :order => "created_at asc"
+  has_many    :events, :order => "created_at asc", :dependent => :destroy
   
   is_indexed :fields => ["title", "description", "slug"], 
     :concatenate => [

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -181,25 +181,22 @@ class Repository < ActiveRecord::Base
   def commit_graph_data_by_author(head = "master")
     h = {}
     emails = {}
-    count_author_regexp = /^\s+(\d+)\s(.+)\s\<(\S+)\>$/.freeze
     data = self.git.git.shortlog({:e => true, :s => true }, head)
     data.each_line do |line|
-      if line =~ count_author_regexp
-        count = $1.to_i
-        author = $2
-        email = $3
-        
-        h[author] ||= 0
-        h[author] += count
-        
-        emails[email] = author
-      end
+      count, actor = line.split("\t")
+      actor = Grit::Actor.from_string(actor)
+      
+      h[actor.name] ||= 0
+      h[actor.name] += count.to_i      
+      emails[actor.email] = actor.name
     end
     
     users = User.find(:all, :conditions => ["email in (?)", emails.keys])
     users.each do |user|
       author_name = emails[user.email]
-      h[user.login] = h.delete(author_name)
+      if h[author_name] # in the event that a user with the same name has used two different emails, he'd be gone by now
+        h[user.login] = h.delete(author_name) 
+      end
     end
     
     h

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
   has_many :repositories, :through => :committerships
   has_many :ssh_keys, :order => "id desc"
   has_many :comments
-  has_many :events, :order => "events.created_at asc"
+  has_many :events, :order => "events.created_at asc", :dependent => :destroy
   
   # Virtual attribute for the unencrypted password
   attr_accessor :password, :current_password

--- a/app/views/projects/confirm_delete.html.erb
+++ b/app/views/projects/confirm_delete.html.erb
@@ -9,7 +9,7 @@
 </p>
 
 <% content_for :submenu do -%>
-  <li class="selected"><%= link_to "Edit project", edit_project_path(@project) -%>)</li>
+  <li class="selected"><%= link_to "Edit project", edit_project_path(@project) -%></li>
 <% end -%>
 
 <% content_for :sidebar do -%>

--- a/app/views/projects/edit.html.erb
+++ b/app/views/projects/edit.html.erb
@@ -7,7 +7,7 @@
 <% end -%>
 
 <% content_for :submenu do -%>
-  <li class="selected"><%= link_to "Edit project", edit_project_path(@project) -%>)</li>
+  <li class="selected"><%= link_to "Edit project", edit_project_path(@project) -%></li>
 <% end -%>
 
 <% content_for :sidebar do -%>

--- a/app/views/repositories/_context_menu.html.erb
+++ b/app/views/repositories/_context_menu.html.erb
@@ -1,7 +1,7 @@
 <li><%= link_to "Overview", [@project, @repository] -%></li>
 <li><%= link_to "Commits", 
           project_repository_logs_path(@project, @repository) -%></li>
-<li><%= link_to "Trees", 
+<li><%= link_to "Source Tree", 
           project_repository_trees_path(@project, @repository) -%></li>
 <li><%= link_to "Comments (#{@repository.comments.count})", 
           project_repository_comments_path(@project, @repository) -%></li>

--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -35,7 +35,7 @@
     <h4>Repository clones</h4>
     <ul>
     <% @repositories.each do |repo| -%>
-      <li><%= link_to h(repo.name), [repo.project, repo] -%></li>
+      <li><%= link_to h("#{repo.project.slug}/#{repo.name}"), [repo.project, repo] -%></li>
     <% end -%>
     </ul>
   <% end -%>

--- a/data/hooks/post-receive
+++ b/data/hooks/post-receive
@@ -72,7 +72,7 @@ while line = gets
   user = User.find_by_email(hash[:email])
   if user.nil?
     # TODO: no user should be ok, no need to skip
-    $stdout.puts "** The email '#{hash[:email]}' is not registered."
+    # $stdout.puts "** The email '#{hash[:email]}' is not registered."
     next
   end
   

--- /dev/null
+++ b/script/destroy_invalid_events
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= "production"
+require File.dirname(__FILE__)+'/../config/environment'
+
+Event.find(:all).each do |event|
+  begin
+    event.target_type.constantize.find(event.target_id)
+    Project.find(event.project_id)
+  rescue ActiveRecord::RecordNotFound
+    puts "Destroying invalid event '#{event.id}:#{Action.name(event.action)}'"
+    event.destroy
+  end
+end
+
+