From 457fc61cec2b3ef2224ef673ae3e72d7d35c88ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 28 Nov 2014 17:10:32 -0200 Subject: [PATCH] Use jquery-rails master to resolve dependencies delayed_job_active_record doesn't allow Rails 5 yet --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 99e2cb9f58..e2cbce24c8 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rake', '>= 10.3' gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'jquery-rails', '~> 4.0' +gem 'jquery-rails', github: 'rails/jquery-rails' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' @@ -47,7 +47,7 @@ group :job do 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