1 files changed, 3 insertions, 32 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1060b8f..78f24f0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -25,9 +25,9 @@ class UsersController < ApplicationController
     :pending_activation, :activate, :forgot_password, :forgot_password_create, :reset_password
   ]
   before_filter :require_not_logged_in, :only => [:pending_activation]
-  before_filter :login_required, :only => [:edit, :update, :password, :update_password, :avatar, :watched_activities]
-  before_filter :find_user, :only => [:show, :edit, :update, :password, :update_password, :avatar, :activities, :watched_activities]
-  before_filter :require_current_user, :only => [:edit, :update, :password, :update_password, :avatar, :watched_activities]
+  before_filter :login_required, :only => [:edit, :update, :password, :update_password, :avatar]
+  before_filter :find_user, :only => [:show, :edit, :update, :password, :update_password, :avatar]
+  before_filter :require_current_user, :only => [:edit, :update, :password, :update_password, :avatar]
   before_filter :require_identity_url_in_session, :only => [:openid_build, :openid_create]
   before_filter :require_public_user, :only => :show
   renders_in_global_context
@@ -38,35 +38,6 @@ class UsersController < ApplicationController
   def new
   end
 
-  def activities
-    respond_to do |wants|
-      wants.js do
-        @event_pagination_params = {:action => "show"}
-        render(:partial => "events/events", :locals => {
-            :events => @user.events.paginate({
-                :page => params[:page],
-                :order => "events.created_at desc",
-                :include => [:user, :project]
-              })
-          })
-      end
-    end
-  end
-
-  def watched_activities
-    @events = @user.events_in_watchlist.paginate(:page => params[:page],
-      :include => [:user, :project])
-    respond_to do |wants|
-      wants.js do
-        @event_pagination_params = {:action => "show", :events => "watched"}
-        render(:partial => "events/events", :locals => {
-            :events => @events
-          })
-        render :partial => "events/events", :locals => {:events => @events}
-      end
-    end
-  end
-
   def show
     @projects = @user.projects.find(:all, :include => [:tags, { :repositories => :project }])
     @repositories = @user.commit_repositories