--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -14,10 +14,20 @@ class UsersController < ApplicationController
     
     @commits_last_week = @user.events.count(:all, 
       :conditions => ["created_at > ? AND action = ?", 7.days.ago, Action::COMMIT])
-    @atom_auto_discovery_url = formatted_user_path(@user, :atom)
+    @atom_auto_discovery_url = formatted_feed_user_path(@user, :atom)
     
     respond_to do |format|
       format.html { }
+      format.atom { redirect_to formatted_feed_user_path(@user, :atom) }
+    end
+  end
+  
+  def feed
+    @user = User.find_by_login!(params[:id])
+    @events = @user.events.find(:all, :order => "events.created_at desc", 
+      :include => [:user, :project], :limit => 30)
+    respond_to do |format|
+      format.html { redirect_to user_path(@user) }
       format.atom { }
     end
   end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,6 +2,11 @@
 module ApplicationHelper
   include TagsHelper
   
+  def feed_icon(url, alt_title = "Atom feed", size = :small)
+    link_to image_tag("feed_12.png", :class => "feed_icon"), url, 
+      :alt => alt_title, :title => alt_title
+  end
+  
   def default_css_tag_sizes
     %w(tag_size_1 tag_size_2 tag_size_3 tag_size_4)
   end
@@ -144,9 +149,9 @@ module ApplicationHelper
         action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}"
         category = "project"
       when Action::COMMIT
-        project = target.project
+        project = event.project
         action = "<strong>committed</strong> #{link_to event.data[0,8], project_repository_commit_path(project, target, event.data)} to #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
-        body = truncate(event.body, 150)
+        body = link_to(h(truncate(event.body, 150)), project_repository_commit_path(project, target, event.data))
         category = "commit"
       when Action::CREATE_BRANCH
         project = target.project

--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -5,7 +5,7 @@
   <%= auto_link(markdown(sanitize(@project.description)), :urls) -%>
 </div>
 
-<h2>Activities<%= link_to image_tag("feed.png", :width => 24, :height => 24), @atom_auto_discovery_url %></h2>
+<h2>Activities<%= feed_icon @atom_auto_discovery_url %></h2>
 <%= render :partial => "events/events", :locals => { :events => @events } -%>
 
 <% content_for :submenu do -%>

--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -7,9 +7,9 @@
 
   <%= render :partial => "infobox" -%>
   
-  <%= render_readme(@repository) %>
+  <%#= render_readme(@repository) %>
   
-  <h2>Activities <%= link_to image_tag("feed.png", :width => 24, :height => 24), @atom_auto_discovery_url %></h2>
+  <h2>Activities <%= feed_icon @atom_auto_discovery_url %></h2>
   <%= render :partial => "events/events", :locals => { :events => @events } -%>
 <% end -%>
 

--- /dev/null
+++ b/app/views/users/feed.atom.builder
@@ -0,0 +1,19 @@
+atom_feed do |feed|
+  feed.title("Gitorious: #{@user.login}'s activity")
+  feed.updated((@events.blank? ? Time.now : @events.first.created_at))
+
+  @events.each do |event|
+    action, body, category = action_and_body_for_event(event)
+    item_url = "http://#{GitoriousConfig['gitorious_host']}" + user_path(@user)
+    feed.entry(event, :url => item_url) do |entry|
+      entry.title("#{h(event.user.login)} #{strip_tags(action)}")
+      entry.content(<<-EOS, :type => 'html')
+<p>#{link_to event.user.login, user_path(event.user)} #{action}</p>
+<p>#{body}<p>
+EOS
+      entry.author do |author|
+        author.name(event.user.login)
+      end
+    end
+  end
+end
\ No newline at end of file

--- a/app/views/users/show.atom.builder
+++ /dev/null
@@ -1,19 +0,0 @@
-atom_feed do |feed|
-  feed.title("Gitorious: #{@user.login}'s activity")
-  feed.updated((@events.blank? ? Time.now : @events.first.created_at))
-
-  @events.each do |event|
-    action, body, category = action_and_body_for_event(event)
-    item_url = "http://#{GitoriousConfig['gitorious_host']}" + user_path(@user)
-    feed.entry(event, :url => item_url) do |entry|
-      entry.title("#{h(event.user.login)} #{strip_tags(action)}")
-      entry.content(<<-EOS, :type => 'html')
-<p>#{link_to event.user.login, user_path(event.user)} #{action}</p>
-<p>#{body}<p>
-EOS
-      entry.author do |author|
-        author.name(event.user.login)
-      end
-    end
-  end
-end
\ No newline at end of file

--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,7 @@
 <% @page_title = h(@user.login) -%>
 
 <% unless @events.empty? -%>
-  <h2>Activities<%= link_to image_tag("feed.png", :width => 24, :height => 24), @atom_auto_discovery_url %></h2>
+  <h2>Activities<%= feed_icon @atom_auto_discovery_url %></h2>
   <%= render :partial => "events/events", :locals => { :events => @events } -%>  
 <% end -%>
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,10 +24,10 @@ ActionController::Routing::Routes.draw do |map|
     account.resources :keys
   end
   map.connect "users/activate/:activation_code", :controller => "users", :action => "activate"
-  map.resources :users, :requirements => {:id => /[^\/\\\.\s]+/ }, :collection => { # FIXME: fails if login contains .
+  map.resources :users, :requirements => {:id => /.+/ }, :collection => {
     :forgot_password => :get,
     :reset_password => :post,
-  }
+  }, :member => { :feed => :get }
   map.resources  :events
   map.resource  :sessions
   map.with_options(:controller => "projects", :action => "category") do |project_cat|

Binary files /dev/null and b/public/images/feed_12.png differ

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -1156,6 +1156,10 @@ ul.diff_stats small.deletions   { color: #DC0000; }
   background: #b6babc;
 }
 
+.event_instance .event_category.comment { background: #a49d98; }
+.event_instance .event_category.project  { background: #98a49f; }
+.event_instance .event_category.merge_request { background: #a2a498; }
+
 /* repository meta (overview apge) */
 table.repository_meta {
 /*  border: 1px solid #ddd;*/
@@ -1194,4 +1198,6 @@ table.repository_meta .meta td.commit_count, table.repository_meta .meta td.bran
 table.repository_meta .meta td .bignum {
   font-size: 20px;
 }
-table.repository_meta .graph td { text-align:center; }
\ No newline at end of file
+table.repository_meta .graph td { text-align:center; }
+
+.feed_icon { margin: 0 4px 0 4px; }
\ No newline at end of file

--- a/script/rebuild_events
+++ b/script/rebuild_events
@@ -7,10 +7,11 @@ require File.dirname(__FILE__) + "/../config/environment"
 
 abort("Usage: #{$0} repo_id") unless ARGV[0]
 
+$stdout.sync = true
+
 def create_repo_creation_events_for(project)
   project.repository_clones.each do |repo|
     puts "creating Repository clone event in #{project.slug}/#{repo.name}"
-   # project.create_event(Action::CLONE_REPOSITORY, repo, repo.user, repo.parent_id)
    project.events.create({
      :action => Action::CLONE_REPOSITORY,
      :target => repo,
@@ -24,7 +25,6 @@ end
 def create_comment_events_for(repo, project)
   repo.comments.each do |comment| 
     puts "creating Comment event on #{project.slug}/#{repo.name}"
-    #project.create_event(Action::COMMENT, comment, comment.user)
     project.events.create({
       :action => Action::COMMENT,
       :target => comment,
@@ -67,11 +67,11 @@ def create_events_for_repository(repo, project)
       users_commits[commit.committer.email] ||= []
       users_commits[commit.committer.email] << commit
     end
-  
+    
     users = User.find(:all, :conditions => ['email in (?)', users_commits.keys] )
     users.each do |user|
       commits = users_commits[user.email]
-    
+      puts "\nindexing #{commits.size} commits for #{user.email} in #{project.slug}/#{repo.name}:#{head.name}"
       commits.each_index do |i|
         commit = commits[i]
         previous_commit = commits[i-1]
@@ -152,8 +152,8 @@ def create_events_for_repository(repo, project)
           end
         end
       
-        puts "#{current_rev_type}#{action.inspect} in #{project.slug}/#{repo.name}:#{head.name}: #{commit.short_message}"
-        #project.create_event(action_id, repo, user, commit.id, commit.message)
+        print "." if (i % 10 == 1)
+        #puts "#{current_rev_type}#{action.inspect} in #{project.slug}/#{repo.name}:#{head.name}: #{commit.short_message}"
         project.events.create({
           :action => action_id || Action::COMMIT, 
           :target => repo, 
@@ -163,6 +163,7 @@ def create_events_for_repository(repo, project)
           :created_at => commit.committed_date})
       end
       commits = nil
+      puts
     end
     users_commits = nil
   end

--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -98,6 +98,20 @@ describe UsersController do
     (assigns[:commits_last_week] >= 0).should == true
   end
   
+  it "#show sets atom feed autodiscovery" do
+    user = users(:johan)
+    get :show, :id => user.login
+    assigns[:atom_auto_discovery_url].should == formatted_feed_user_path(user, :atom)
+  end
+  
+  it "has an atom feed" do
+    user = users(:johan)
+    get :feed, :id => user.login, :format => "atom"
+    response.should be_success
+    assigns[:user].should == user
+    assigns[:events].should == user.events.find(:all, :limit => 30, :order => "created_at desc")
+  end
+  
   describe "#forgot_password" do
     it "GETs the page fine for everyone" do
       get :forgot_password