1 files changed, 15 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 9e486b0d9e..08aa842d2f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails-dom-testing', github: 'rails/rails-dom-testing'
-
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
 gem 'rake', '>= 10.3'
 
@@ -13,9 +11,10 @@ gem 'rake', '>= 10.3'
 gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
-gem 'jquery-rails', '~> 4.0.0.beta2'
-gem 'coffee-rails', '~> 4.0.0'
-gem 'turbolinks', '~> 2.2.3'
+gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
+gem 'coffee-rails', '~> 4.1.0'
+gem 'turbolinks'
+gem 'arel', github: 'rails/arel', branch: 'master'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid ActiveModel (and by extension the entire framework)
@@ -28,9 +27,9 @@ gem 'uglifier', '>= 1.3.0', require: false
 
 group :doc do
   gem 'sdoc', '~> 0.4.0'
-  gem 'redcarpet', '~> 3.1.2', platforms: :ruby
+  gem 'redcarpet', '~> 3.2.2', platforms: :ruby
   gem 'w3c_validators'
-  gem 'kindlerb'
+  gem 'kindlerb', '0.1.1'
 end
 
 # AS
@@ -43,13 +42,13 @@ group :job do
   gem 'sidekiq', require: false
   gem 'sucker_punch', require: false
   gem 'delayed_job', require: false
-  gem 'queue_classic', "< 3.0.0", require: false, platforms: :ruby
+  gem 'queue_classic', require: false, platforms: :ruby
   gem 'sneakers', '0.1.1.pre', require: false
   gem 'que', require: false
   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
 
@@ -65,8 +64,12 @@ group :test do
     gem 'ruby-prof', '~> 0.11.2'
   end
 
-  # platforms :mri_19, :mri_20 do
-  #   gem 'debugger'
+  platforms :mri_21, :mri_22 do
+    gem 'stackprof'
+  end
+
+  # platforms :mri do
+  #   gem 'byebug'
   # end
 
   gem 'benchmark-ips'
@@ -82,7 +85,7 @@ platforms :ruby do
   gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem 'pg', '>= 0.11.0'
+    gem 'pg', '>= 0.18.0'
     gem 'mysql', '>= 2.9.0'
     gem 'mysql2', '>= 0.3.13'
   end