Merge remote branch 'rails/master' into pg_schema_fu

1 files changed, 5 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index f7ea906827..fc4fdb17f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,9 @@ gem "memcache-client", ">= 1.8.5"
 
 platforms :mri_18 do
   gem "system_timer"
+  # ruby-debug requires linecache which depends on require_relative but doesn't explicitly
+  # declare this in its gemspec
+  gem "require_relative"
   gem "ruby-debug", ">= 0.10.3"
   gem "json"
 end
@@ -41,7 +44,7 @@ platforms :ruby do
   end
   gem "json"
   gem "yajl-ruby"
-  gem "nokogiri", ">= 1.4.4"
+  gem "nokogiri", ">= 1.4.5"
 
   group :test do
     gem "ruby-prof" if RUBY_VERSION < "1.9.3"
@@ -53,7 +56,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.11.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.0"
+    gem "mysql2", ">= 0.3.6"
   end
 end