1 files changed, 39 insertions, 30 deletions

diff --git a/Gemfile b/Gemfile
index 78224f60ed..1fbf1dd52e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,30 +5,33 @@ gemspec
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
 gem 'rake', '>= 10.3'
 
-# This needs to be with require false as it is
-# loaded after loading the test library to
-# ensure correct loading order
+# This needs to be with require false to ensure correct loading order, as has to
+# be loaded after loading the test library.
 gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
-gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
+gem 'jquery-rails'
 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)
+# This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
-gem 'bcrypt', '~> 3.1.10', require: false
+platforms :mingw, :x64_mingw, :mswin, :mswin64 do
+  gem 'bcrypt-ruby', '~> 3.0.0', require: false
+end
+
+platforms :ruby, :jruby, :rbx do
+  gem 'bcrypt', '~> 3.1.10', require: false
+end
 
-# This needs to be with require false to avoid
-# it being automatically loaded by sprockets
+# This needs to be with require false to avoid it being automatically loaded by
+# sprockets.
 gem 'uglifier', '>= 1.3.0', require: false
 
+# Track stable branch of sass because it doesn't have circular require warnings.
+gem 'sass', github: 'sass/sass', branch: 'stable', require: false
+
 group :doc do
   gem 'sdoc', '~> 0.4.0'
   gem 'redcarpet', '~> 3.2.3', platforms: :ruby
@@ -36,17 +39,18 @@ group :doc do
   gem 'kindlerb', '0.1.1'
 end
 
-# ActiveSupport
+# Active Support.
 gem 'dalli', '>= 2.2.1'
+gem 'listen', '~> 3.0.5', require: false
 
-# ActiveJob
+# Active Job.
 group :job do
   gem 'resque', require: false
   gem 'resque-scheduler', require: false
   gem 'sidekiq', require: false
-  gem 'sucker_punch', require: false
+  gem 'sucker_punch', '< 2.0', require: false
   gem 'delayed_job', require: false
-  gem 'queue_classic', require: false, platforms: :ruby
+  gem 'queue_classic', github: "QueueClassic/queue_classic", branch: 'master', require: false, platforms: :ruby
   gem 'sneakers', require: false
   gem 'que', require: false
   gem 'backburner', require: false
@@ -56,12 +60,17 @@ group :job do
   gem 'sequel', require: false
 end
 
-# Add your own local bundler stuff
+# Action Cable
+group :cable do
+  gem 'puma', require: false
+end
+
+# Add your own local bundler stuff.
 local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
 instance_eval File.read local_gemfile if File.exist? local_gemfile
 
 group :test do
-  # FIX: Our test suite isn't ready to run in random order yet
+  # FIX: Our test suite isn't ready to run in random order yet.
   gem 'minitest', '< 5.3.4'
 
   platforms :mri do
@@ -72,19 +81,18 @@ group :test do
   gem 'benchmark-ips'
 end
 
-platforms :ruby do
-  gem 'nokogiri', '>= 1.4.5'
+platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
+  gem 'nokogiri', '>= 1.6.7.1'
 
-  # Needed for compiling the ActionDispatch::Journey parser
+  # Needed for compiling the ActionDispatch::Journey parser.
   gem 'racc', '>=1.4.6', require: false
 
-  # ActiveRecord
+  # Active Record.
   gem 'sqlite3', '~> 1.3.6'
 
   group :db do
     gem 'pg', '>= 0.18.0'
-    gem 'mysql', '>= 2.9.0'
-    gem 'mysql2', '>= 0.3.18'
+    gem 'mysql2', '>= 0.4.0'
   end
 end
 
@@ -106,18 +114,19 @@ platforms :jruby do
 end
 
 platforms :rbx do
-  # The rubysl-yaml gem doesn't ship with Psych by default
-  # as it needs libyaml that isn't always available.
+  # The rubysl-yaml gem doesn't ship with Psych by default as it needs
+  # libyaml that isn't always available.
   gem 'psych', '~> 2.0'
 end
 
-# gems that are necessary for ActiveRecord tests with Oracle database
+# Gems that are necessary for Active Record tests with Oracle.
 if ENV['ORACLE_ENHANCED']
   platforms :ruby do
-    gem 'ruby-oci8', '~> 2.1'
+    gem 'ruby-oci8', '~> 2.2'
   end
   gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
 end
 
-# A gem necessary for ActiveRecord tests with IBM DB
+# A gem necessary for Active Record tests with IBM DB.
 gem 'ibm_db' if ENV['IBM_DB']
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]