Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_view/template/path.rb
	activesupport/lib/active_support/json/encoders/hash.rb

1 files changed, 15 insertions, 8 deletions

diff --git a/activesupport/lib/active_support/core_ext/numeric/bytes.rb b/activesupport/lib/active_support/core_ext/numeric/bytes.rb
index 507d651261..deea8e9358 100644
--- a/activesupport/lib/active_support/core_ext/numeric/bytes.rb
+++ b/activesupport/lib/active_support/core_ext/numeric/bytes.rb
@@ -1,4 +1,11 @@
 class Numeric
+  KILOBYTE = 1024
+  MEGABYTE = KILOBYTE * 1024
+  GIGABYTE = MEGABYTE * 1024
+  TERABYTE = GIGABYTE * 1024
+  PETABYTE = TERABYTE * 1024
+  EXABYTE  = PETABYTE * 1024
+
   # Enables the use of byte calculations and declarations, like 45.bytes + 2.6.megabytes
   def bytes
     self
@@ -6,32 +13,32 @@ class Numeric
   alias :byte :bytes
 
   def kilobytes
-    self * 1024
+    self * KILOBYTE
   end
   alias :kilobyte :kilobytes
 
   def megabytes
-    self * 1024.kilobytes
+    self * MEGABYTE
   end
   alias :megabyte :megabytes
 
   def gigabytes
-    self * 1024.megabytes 
+    self * GIGABYTE
   end
   alias :gigabyte :gigabytes
 
   def terabytes
-    self * 1024.gigabytes
+    self * TERABYTE
   end
   alias :terabyte :terabytes
-  
+
   def petabytes
-    self * 1024.terabytes
+    self * PETABYTE
   end
   alias :petabyte :petabytes
-  
+
   def exabytes
-    self * 1024.petabytes
+    self * EXABYTE
   end
   alias :exabyte :exabytes
 end