diff app/controllers/watchers_controller.rb @ 935:fe0249c097f6 live

Merge from the default branch

--- a/app/controllers/watchers_controller.rb	Tue Mar 13 16:33:49 2012 +0000
+++ b/app/controllers/watchers_controller.rb	Wed Jul 11 13:33:14 2012 +0100
@@ -5,12 +5,12 @@
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -19,11 +19,11 @@
   before_filter :find_project
   before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
   before_filter :authorize, :only => [:new, :destroy]
-  
+
   verify :method => :post,
          :only => [ :watch, :unwatch ],
          :render => { :nothing => true, :status => :method_not_allowed }
-  
+
   def watch
     if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
       render_403
@@ -31,11 +31,11 @@
       set_watcher(User.current, true)
     end
   end
-  
+
   def unwatch
     set_watcher(User.current, false)
   end
-  
+
   def new
     @watcher = Watcher.new(params[:watcher])
     @watcher.watchable = @watched
@@ -51,7 +51,7 @@
   rescue ::ActionController::RedirectBackError
     render :text => 'Watcher added.', :layout => true
   end
-  
+
   def destroy
     @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
     respond_to do |format|
@@ -63,7 +63,7 @@
       end
     end
   end
-  
+
 private
   def find_project
     klass = Object.const_get(params[:object_type].camelcase)
@@ -73,7 +73,7 @@
   rescue
     render_404
   end
-  
+
   def set_watcher(user, watching)
     @watched.set_watcher(user, watching)
     respond_to do |format|