1 files changed, 33 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 2a695df618..ae68fba421 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,18 +2,19 @@ source 'https://rubygems.org'
 
 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
 gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
-gem 'jquery-rails', '~> 3.1.0'
+gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
+gem 'coffee-rails', '~> 4.1.0'
 gem 'turbolinks'
-gem 'coffee-rails', '~> 4.0.0'
 gem 'arel', github: 'rails/arel', branch: 'master'
-gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
-gem 'i18n', github: 'svenfuchs/i18n', 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)
@@ -34,6 +35,23 @@ end
 # AS
 gem 'dalli', '>= 2.2.1'
 
+# ActiveJob
+group :job do
+  gem 'resque', require: false
+  gem 'resque-scheduler', require: false
+  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 '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 'sequel', 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
@@ -46,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
@@ -63,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
@@ -86,6 +108,12 @@ platforms :jruby do
   end
 end
 
+platforms :rbx do
+  # 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
 if ENV['ORACLE_ENHANCED']
   platforms :ruby do