summaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 88e18b8d0..44fe8175f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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