aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--actionpack/lib/action_dispatch/http/headers.rb2
2 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index f94f267f05..1b7d478f18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,8 +41,7 @@ platforms :mri_18 do
end
platforms :mri_19 do
- # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
- gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
+ gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS']
end
platforms :mri do
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 505d5560b1..040b51e040 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -1,5 +1,3 @@
-require 'active_support/memoizable'
-
module ActionDispatch
module Http
class Headers < ::Hash