From 8ecc5ab1d88532a239f17c7520ed922c7579b01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 10 May 2016 01:07:09 -0300 Subject: Start Rails 5.1 development :tada: --- Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 64e467604b..477309fa9b 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 -- cgit v1.2.3 From 61483b18bcbfaa054113a67f40515c7bf3e892b2 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Sun, 22 May 2016 02:15:58 +0800 Subject: Remove Blade gem dependency Apps that depend on Action Cable don't need Blade for app development, so we can remove the gem dependency. We do need Blade for Action Cable dev, so we bundle it in the Gemfile. Signed-off-by: Jeremy Daer --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 477309fa9b..75adda01af 100644 --- a/Gemfile +++ b/Gemfile @@ -64,6 +64,7 @@ group :cable do gem 'redis', require: false gem 'faye-websocket', require: false + gem 'blade', '~> 0.5.1', require: false end # Add your own local bundler stuff. -- cgit v1.2.3 From 11078dddbb94c620bff13a7c656390392b2007f8 Mon Sep 17 00:00:00 2001 From: Javan Makhmali Date: Mon, 23 May 2016 09:37:16 -0400 Subject: Build action_cable.js with Blade --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 75adda01af..776d39d569 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ group :cable do gem 'redis', require: false gem 'faye-websocket', require: false - gem 'blade', '~> 0.5.1', require: false + gem 'blade', '~> 0.5.5', require: false end # Add your own local bundler stuff. -- cgit v1.2.3 From 8cfce058d9d002526fd93e66957f8359985c92bf Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Mon, 9 May 2016 15:42:28 -0400 Subject: CI: run Action Cable browser tests in Sauce Labs Allow failures until test runs are consistently stable, not hanging. Closes #24943. Signed-off-by: Jeremy Daer --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 776d39d569..858aa55916 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +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. -- cgit v1.2.3