--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -2,6 +2,7 @@ class MergeRequestsController < ApplicationController
   before_filter :login_required, :except => [:index, :show]
   before_filter :find_project
   before_filter :find_repository
+  before_filter :check_repository_for_commits
   before_filter :find_merge_request, :except => [:index, :show, :new, :create]
   before_filter :assert_merge_request_ownership, :except => [:index, :show, :new, :create, :resolve]
   before_filter :assert_merge_request_resolvable, :only => [:resolve]

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -35,10 +35,12 @@ class ProjectsController < ApplicationController
     @repositories = @project.repository_clones
     @events = @project.events.paginate(:all, :page => params[:page], 
       :order => "created_at desc", :include => [:user, :project])
+    @atom_auto_discovery_url = formatted_project_path(@project, :atom)
     
     respond_to do |format|
       format.html
-      format.xml { render :xml => @project }
+      format.xml  { render :xml => @project }
+      format.atom { }
     end
   end
   

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -18,7 +18,7 @@ class RepositoriesController < ApplicationController
     respond_to do |format|
       format.html
       format.xml  { render :xml => @repository }
-      format.atom { render :template => "logs/feed.atom.builder" }
+      format.atom {  }
     end
   end
   

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -14,6 +14,12 @@ 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)
+    
+    respond_to do |format|
+      format.html { }
+      format.atom { }
+    end
   end
 
   def create

--- /dev/null
+++ b/app/views/projects/show.atom.builder
@@ -0,0 +1,19 @@
+atom_feed do |feed|
+  feed.title("Gitorious: #{@project.slug} 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']}" + project_path(@project)
+    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/repositories/index.html.erb
+++ b/app/views/repositories/index.html.erb
@@ -15,10 +15,12 @@
         <span class="bignum"><%= repo.events.count -%></span> activities
       </td>
       <td class="branch_count">
-        <span class="bignum"><%= repo.git.heads.size -%></span> branches
+        <span class="bignum"><%= repo.ready? ? repo.git.heads.size : 0 -%></span> branches
       </td>
       <td class="author_count">
-        <span class="bignum"><%= repo.commit_graph_data_by_author.keys.size -%></span> authors
+        <span class="bignum">
+          <%= repo.ready? ? repo.commit_graph_data_by_author.keys.size : 0 -%>
+        </span> authors
       </td>
     </tr>
     <tr class="graph">

--- /dev/null
+++ b/app/views/repositories/show.atom.builder
@@ -0,0 +1,19 @@
+atom_feed do |feed|
+  feed.title("Gitorious: #{@project.slug}/#{@repository.name} 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']}" + project_repository_path(@project, @repository)
+    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

--- /dev/null
+++ b/app/views/users/show.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