aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-06 13:18:51 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-06 13:18:51 -0700
commit7ba95bf7471a03a6c5db7bd9799cd660e57596f9 (patch)
tree954b86938199c5750853962aed64c80e305af3f0 /activesupport/lib/active_support
parent81eb5b38db0b5d680b088d4d543fecc455aa07fb (diff)
parentaed9917094f0a618b440d0bacee3a33b30f7d951 (diff)
downloadrails-7ba95bf7471a03a6c5db7bd9799cd660e57596f9.tar.gz
rails-7ba95bf7471a03a6c5db7bd9799cd660e57596f9.tar.bz2
rails-7ba95bf7471a03a6c5db7bd9799cd660e57596f9.zip
Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8
Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/gzip.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/gzip.rb b/activesupport/lib/active_support/gzip.rb
index 62f9c9aa2e..9651f02c73 100644
--- a/activesupport/lib/active_support/gzip.rb
+++ b/activesupport/lib/active_support/gzip.rb
@@ -1,5 +1,6 @@
require 'zlib'
require 'stringio'
+require 'active_support/core_ext/string/encoding'
module ActiveSupport
# A convenient wrapper for the zlib standard library that allows compression/decompression of strings with gzip.