From ef2c5cab2d44d4d5364c666c1d0c4bd3ea676189 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 13 Apr 2012 19:41:05 +0000 Subject: [PATCH] Merged r9392 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9393 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bf62d7ff2..ec2f983f6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -364,18 +364,6 @@ class ApplicationController < ActionController::Base :content_type => 'application/atom+xml' end - # TODO: remove in Redmine 1.4 - def self.accept_key_auth(*actions) - ActiveSupport::Deprecation.warn "ApplicationController.accept_key_auth is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead." - accept_rss_auth(*actions) - end - - # TODO: remove in Redmine 1.4 - def accept_key_auth_actions - ActiveSupport::Deprecation.warn "ApplicationController.accept_key_auth_actions is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead." - self.class.accept_rss_auth - end - def self.accept_rss_auth(*actions) if actions.any? write_inheritable_attribute('accept_rss_auth_actions', actions) -- 2.39.5