diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-04-28 11:54:12 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-04-28 11:54:12 +0200 |
| commit | 65c29b608cbfe1a6cfb84c41d6c1d83ae0d00f78 (patch) | |
| tree | be54c44079e367968130f432fbc3fd7860ded271 | |
| parent | 80f011ea542c801afc852e1a5f9efa9a30dd4219 (diff) | |
| parent | ee6878695318807234b9b6b1ce1a3fc0feb18b91 (diff) | |
| download | rails-65c29b608cbfe1a6cfb84c41d6c1d83ae0d00f78.tar.gz rails-65c29b608cbfe1a6cfb84c41d6c1d83ae0d00f78.tar.bz2 rails-65c29b608cbfe1a6cfb84c41d6c1d83ae0d00f78.zip | |
Merge pull request #19907 from artofhuman/sneakers-update
Unlock sneakers adapter version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -47,7 +47,7 @@ group :job do gem 'sucker_punch', require: false gem 'delayed_job', require: false gem 'queue_classic', require: false, platforms: :ruby - gem 'sneakers', '0.1.1.pre', require: false + gem 'sneakers', require: false gem 'que', require: false gem 'backburner', require: false gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false diff --git a/Gemfile.lock b/Gemfile.lock index de83b535c2..5adbf65045 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM beaneater (0.3.3) benchmark-ips (2.1.1) builder (3.2.2) - bunny (1.1.9) + bunny (1.7.0) amq-protocol (>= 1.9.2) byebug (4.0.5) columnize (= 0.9.0) @@ -224,11 +224,11 @@ GEM rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) - sneakers (0.1.1.pre) - bunny (~> 1.1.3) - serverengine + sneakers (1.0.4) + bunny (~> 1.7.0) + serverengine (~> 1.5.5) thor - thread + thread (~> 0.1.7) sprockets (3.0.2) rack (~> 1.0) sqlite3 (1.3.10) @@ -236,7 +236,7 @@ GEM sucker_punch (1.3.2) celluloid (~> 0.16.0) thor (0.19.1) - thread (0.1.5) + thread (0.1.7) thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) @@ -297,7 +297,7 @@ DEPENDENCIES sdoc (~> 0.4.0) sequel sidekiq - sneakers (= 0.1.1.pre) + sneakers sprockets (~> 3.0.0.rc.1) sprockets-rails! sqlite3 (~> 1.3.6) |