Remove @rss_*@ deprecated methods (#36806).

git-svn-id: https://svn.redmine.org/redmine/trunk@22416 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 0 insertions, 17 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e83e08989..9bd6b831a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -635,21 +635,10 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def self.accept_rss_auth(*actions)
-    ActiveSupport::Deprecation.warn "Application#self.accept_rss_auth is deprecated and will be removed in Redmine 6.0. Please use #self.accept_atom_auth instead."
-    self.class.accept_atom_auth(*actions)
-  end
-
   def accept_atom_auth?(action=action_name)
     self.class.accept_atom_auth.include?(action.to_sym)
   end
 
-  # TODO: remove in Redmine 6.0
-  def accept_rss_auth?(action=action_name)
-    ActiveSupport::Deprecation.warn "Application#accept_rss_auth? is deprecated and will be removed in Redmine 6.0. Please use #accept_atom_auth? instead."
-    accept_atom_auth?(action)
-  end
-
   def self.accept_api_auth(*actions)
     if actions.any?
       self.accept_api_auth_actions = actions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 1d0ca617d..860a91f06 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -130,12 +130,6 @@ class MyController < ApplicationController
     redirect_to my_account_path
   end
 
-  # TODO: remove in Redmine 6.0
-  def reset_rss_key
-    ActiveSupport::Deprecation.warn "My#reset_rss_key is deprecated and will be removed in Redmine 6.0. Please use #reset_atom_key instead."
-    reset_atom_key
-  end
-
   def show_api_key
     @user = User.current
   end