diff app/controllers/projects_controller.rb @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Thu, 14 Jul 2011 10:37:36 +0100
parents 350acce374a2 0c939c159af4
children b2a9e64b8283
line wrap: on
line diff
--- a/app/controllers/projects_controller.rb	Thu Jul 14 10:21:43 2011 +0100
+++ b/app/controllers/projects_controller.rb	Thu Jul 14 10:37:36 2011 +0100
@@ -24,7 +24,8 @@
   before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
   before_filter :authorize_global, :only => [:new, :create]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
-  accept_key_auth :index, :show, :create, :update, :destroy
+  accept_rss_auth :index
+  accept_api_auth :index, :show, :create, :update, :destroy
 
   after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
     if controller.request.post?