1 files changed, 16 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index eb0a324ab2..78224f60ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,11 +15,15 @@ gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'turbolinks'
 gem 'arel', github: 'rails/arel', branch: 'master'
+gem 'mail', github: 'mikel/mail'
+
+gem 'sprockets', '~> 3.0.0.rc.1'
+gem 'sprockets-rails', github: 'rails/sprockets-rails', 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)
 # being dependent on a binary library.
-gem 'bcrypt', '~> 3.1.7', require: false
+gem 'bcrypt', '~> 3.1.10', require: false
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
@@ -27,12 +31,12 @@ gem 'uglifier', '>= 1.3.0', require: false
 
 group :doc do
   gem 'sdoc', '~> 0.4.0'
-  gem 'redcarpet', '~> 3.2.2', platforms: :ruby
+  gem 'redcarpet', '~> 3.2.3', platforms: :ruby
   gem 'w3c_validators'
-  gem 'kindlerb'
+  gem 'kindlerb', '0.1.1'
 end
 
-# AS
+# ActiveSupport
 gem 'dalli', '>= 2.2.1'
 
 # ActiveJob
@@ -42,13 +46,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 'sneakers', '0.1.1.pre', require: false
+  gem 'queue_classic', require: false, platforms: :ruby
+  gem 'sneakers', 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
 
@@ -60,18 +64,11 @@ group :test do
   # FIX: Our test suite isn't ready to run in random order yet
   gem 'minitest', '< 5.3.4'
 
-  platforms :mri_19 do
-    gem 'ruby-prof', '~> 0.11.2'
-  end
-
-  platforms :mri_21 do
+  platforms :mri do
     gem 'stackprof'
+    gem 'byebug'
   end
 
-  # platforms :mri do
-  #   gem 'byebug'
-  # end
-
   gem 'benchmark-ips'
 end
 
@@ -81,13 +78,13 @@ platforms :ruby do
   # Needed for compiling the ActionDispatch::Journey parser
   gem 'racc', '>=1.4.6', require: false
 
-  # AR
+  # ActiveRecord
   gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem 'pg', '>= 0.15.0'
+    gem 'pg', '>= 0.18.0'
     gem 'mysql', '>= 2.9.0'
-    gem 'mysql2', '>= 0.3.13'
+    gem 'mysql2', '>= 0.3.18'
   end
 end