diff options
Diffstat (limited to 'app')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 26 | ||||
| -rw-r--r-- | app/models/concerns/translatable.rb | 6 | ||||
| -rw-r--r-- | app/models/user.rb | 6 |
3 files changed, 0 insertions, 38 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 21eb39c0e..a47dd94ea 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -241,32 +241,6 @@ module LinkToHelper link_to h(query), search_url(query) end - # Deprecated helper - # TODO: Remove in next release - def admin_url(relative_path) - warn "[DEPRECATION] admin_url is deprecated. Please remove it from your theme." - relative_path - end - - # Deprecated helper - # TODO: Remove in next release - def main_url(relative_path, append = nil) - warn "[DEPRECATION] main_url is deprecated. Please remove it from your theme." - url_prefix = "http://" + AlaveteliConfiguration::domain - url = url_prefix + relative_path - if !append.nil? - begin - env = Rack::MockRequest.env_for(url) - req = Rack::Request.new(env) - req.path_info += append - url = req.url - rescue URI::InvalidURIError - # don't append to it - end - end - return url - end - # About page URLs def about_url return help_general_url(:action => 'about') diff --git a/app/models/concerns/translatable.rb b/app/models/concerns/translatable.rb index bc89e4c3b..2aa4620d0 100644 --- a/app/models/concerns/translatable.rb +++ b/app/models/concerns/translatable.rb @@ -29,12 +29,6 @@ module Translatable end end - def translated_versions=(translation_attrs) - warn "[DEPRECATION] #{self.class.name}#translated_versions= will be replaced " \ - "by #{self.class.name}#translations_attributes= as of release 0.22" - self.translations_attributes = translation_attrs - end - private def empty_translation_in_params?(attributes) diff --git a/app/models/user.rb b/app/models/user.rb index d50000aba..8c9e3c453 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -304,12 +304,6 @@ class User < ActiveRecord::Base !ban_text.empty? end - def public_banned? - warn %q([DEPRECATION] User#public_banned? will be replaced with - User#banned? as of 0.22).squish - banned? - end - # Various ways the user can be banned, and text to describe it if failed def can_file_requests? ban_text.empty? && !exceeded_limit? |