From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 18 May 2011 07:12:04 +0000 (+0000)
Subject: remove trailing white-spaces and an empty line from activities controller source.
X-Git-Tag: 1.2.0~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d4e4f241c6148fa2dcf32cfedfde0fc22ae819a;p=redmine.git

remove trailing white-spaces and an empty line from activities controller source.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5835 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index d6292ea9a..cd03432b2 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -5,7 +5,7 @@ class ActivitiesController < ApplicationController
 
   def index
     @days = Setting.activity_days_default.to_i
-    
+
     if params[:from]
       begin; @date_to = params[:from].to_date + 1; rescue; end
     end
@@ -14,18 +14,18 @@ class ActivitiesController < ApplicationController
     @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
+
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                              :with_subprojects => @with_subprojects,
                                                              :author => @author)
     @activity.scope_select {|t| !params["show_#{t}"].nil?}
     @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
 
     events = @activity.events(@date_from, @date_to)
-    
+
     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
       respond_to do |format|
-        format.html { 
+        format.html {
           @events_by_day = events.group_by(&:event_date)
           render :layout => false if request.xhr?
         }
@@ -40,7 +40,7 @@ class ActivitiesController < ApplicationController
         }
       end
     end
-    
+
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -55,5 +55,4 @@ class ActivitiesController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render_404
   end
-
 end