Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-02 11:25:55 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22416 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2023-11-06 20:36:48 +00:00
parent 63188014b0
commit f0f1d49b56
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/application_controller.rb
View File

@@ -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

6
app/controllers/my_controller.rb
View File

@@ -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

12
app/models/user.rb
View File

@@ -422,12 +422,6 @@ class User < Principal
atom_token.value
end
# TODO: remove in Redmine 6.0
def rss_key
ActiveSupport::Deprecation.warn "User.rss_key is deprecated and will be removed in Redmine 6.0. Please use User.atom_key instead."
atom_key
end
# Return user's API key (a 40 chars long string), used to access the API
def api_key
if api_token.nil?
@@ -539,12 +533,6 @@ class User < Principal
Token.find_active_user('feeds', key)
end
# TODO: remove in Redmine 6.0
def self.find_by_rss_key(key)
ActiveSupport::Deprecation.warn "User.find_by_rss_key is deprecated and will be removed in Redmine 6.0. Please use User.find_by_atom_key instead."
self.find_by_atom_key(key)
end
def self.find_by_api_key(key)
Token.find_active_user('api', key)
end