##// END OF EJS Templates
Merged r9392 from trunk....
Jean-Philippe Lang -
r9259:ef2c5cab2d44
parent child
Show More
@@ -364,18 +364,6 class ApplicationController < ActionController::Base
364 :content_type => 'application/atom+xml'
364 :content_type => 'application/atom+xml'
365 end
365 end
366
366
367 # TODO: remove in Redmine 1.4
368 def self.accept_key_auth(*actions)
369 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."
370 accept_rss_auth(*actions)
371 end
372
373 # TODO: remove in Redmine 1.4
374 def accept_key_auth_actions
375 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."
376 self.class.accept_rss_auth
377 end
378
379 def self.accept_rss_auth(*actions)
367 def self.accept_rss_auth(*actions)
380 if actions.any?
368 if actions.any?
381 write_inheritable_attribute('accept_rss_auth_actions', actions)
369 write_inheritable_attribute('accept_rss_auth_actions', actions)
General Comments 0
You need to be logged in to leave comments. Login now