Merge branch 'master' into always-inherit-from-application-record

1 files changed, 8 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index 64e467604b..858aa55916 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'mocha', '~> 0.14', require: false
 
 gem 'rack-cache', '~> 1.2'
 gem 'jquery-rails'
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', github: 'rails/coffee-rails'
 gem 'turbolinks', github: 'turbolinks/turbolinks-rails'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
@@ -43,14 +43,15 @@ group :job do
   gem 'resque-scheduler', require: false
   gem 'sidekiq', require: false
   gem 'sucker_punch', require: false
-  gem 'delayed_job', require: false
+  gem 'delayed_job', require: false, github: 'collectiveidea/delayed_job'
   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
-  gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
+  #TODO: add qu after it support Rails 5.1
+  # 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, github: 'collectiveidea/delayed_job_active_record'
   gem 'sequel', require: false
 end
 
@@ -63,6 +64,9 @@ group :cable do
   gem 'redis', require: false
 
   gem 'faye-websocket', require: false
+
+  gem 'blade', '~> 0.5.5', require: false
+  gem 'blade-sauce_labs_plugin', github: 'javan/blade-sauce_labs_plugin', require: false
 end
 
 # Add your own local bundler stuff.