Merge branch 'master' of github.com:rails/rails

1 files changed, 7 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 931c8e85bc..a021f77417 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'rake', '>= 10.3'
 gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
-gem 'jquery-rails', '~> 4.0.0.beta2'
+gem 'jquery-rails', github: 'rails/jquery-rails'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'turbolinks'
 gem 'arel', github: 'rails/arel'
@@ -48,7 +48,7 @@ group :job do
   gem 'backburner', require: false
   gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
   gem 'qu-redis', require: false
-  gem 'delayed_job_active_record', require: false
+  # gem 'delayed_job_active_record', require: false
   gem 'sequel', require: false
 end
 
@@ -64,6 +64,10 @@ group :test do
     gem 'ruby-prof', '~> 0.11.2'
   end
 
+  platforms :mri_21 do
+    gem 'stackprof'
+  end
+
   # platforms :mri_19, :mri_20 do
   #   gem 'debugger'
   # end
@@ -81,7 +85,7 @@ platforms :ruby do
   gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem 'pg', '>= 0.11.0'
+    gem 'pg', '>= 0.15.0'
     gem 'mysql', '>= 2.9.0'
     gem 'mysql2', '>= 0.3.13'
   end