aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-11-14 19:59:43 +0000
committerGitHub <noreply@github.com>2016-11-14 19:59:43 +0000
commite491b2c06329afb3c989261a2865d2a93c8b84b8 (patch)
treedd44570d81335f60d655475c91ed3922c60a57d0 /activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb
parent3a82ad746ab479dd1addd9c723197fb9f927194b (diff)
parent0d7bd2031b4054fbdeab0a00dd58b1b08fb7fea6 (diff)
downloadrails-e491b2c06329afb3c989261a2865d2a93c8b84b8.tar.gz
rails-e491b2c06329afb3c989261a2865d2a93c8b84b8.tar.bz2
rails-e491b2c06329afb3c989261a2865d2a93c8b84b8.zip
Merge pull request #27035 from rails/remove-active-support-deprecations
Remove Active Support deprecations
Diffstat (limited to 'activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb')
-rw-r--r--activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb b/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb
index 02b4231794..f263dbe9f8 100644
--- a/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb
+++ b/activesupport/lib/active_support/number_helper/number_to_human_size_converter.rb
@@ -7,10 +7,6 @@ module ActiveSupport
self.validate_float = true
def convert
- if opts.key?(:prefix)
- ActiveSupport::Deprecation.warn("The :prefix option of `number_to_human_size` is deprecated and will be removed in Rails 5.1 with no replacement.")
- end
-
@number = Float(number)
# for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
@@ -54,7 +50,7 @@ module ActiveSupport
end
def base
- opts[:prefix] == :si ? 1000 : 1024
+ 1024
end
end
end