aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-28 17:10:32 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-28 17:10:32 -0200
commit457fc61cec2b3ef2224ef673ae3e72d7d35c88ce (patch)
treeb359e12f5f33e0a61dd7a869c8faa70c1526553b
parentc6bd5284b3d0771e8b8790e5f5a03d21428c99e1 (diff)
downloadrails-457fc61cec2b3ef2224ef673ae3e72d7d35c88ce.tar.gz
rails-457fc61cec2b3ef2224ef673ae3e72d7d35c88ce.tar.bz2
rails-457fc61cec2b3ef2224ef673ae3e72d7d35c88ce.zip
Use jquery-rails master to resolve dependencies
delayed_job_active_record doesn't allow Rails 5 yet
-rw-r--r--Gemfile4
1 files 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