Do not display commits on ~user except as part of a push event

2 files changed, 2 insertions, 1 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b430cc8..bf54098 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -46,7 +46,7 @@ class UsersController < ApplicationController
     @projects = @user.projects.find(:all,
       :include => [:tags, { :repositories => :project }])
     @repositories = @user.commit_repositories
-    @events = @user.events.paginate(
+    @events = @user.events.excluding_commits.paginate(
       :page => params[:page], :order => "events.created_at desc",
       :include => [:user, :project])
     @messages = @user.messages_in_inbox(3) if @user == current_user
diff --git a/app/models/event.rb b/app/models/event.rb
index f956836..5af6fff 100755
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -42,6 +42,7 @@ class Event < ActiveRecord::Base
   validates_presence_of :user_id, :unless => :user_email_set?
 
   named_scope :top, {:conditions => ['target_type != ?', 'Event']}
+  named_scope :excluding_commits, {:conditions => ["action != ?", Action::COMMIT]}
 
   def self.latest(count)
     Rails.cache.fetch("events:latest_#{count}", :expires_in => 10.minutes) do