diff options
| author | Mike Perham <mperham@gmail.com> | 2014-05-20 08:35:12 -0700 |
|---|---|---|
| committer | Mike Perham <mperham@gmail.com> | 2014-05-20 08:35:12 -0700 |
| commit | b49d3f105f765a2c6c440fad5303a2809942422a (patch) | |
| tree | 6db1a67435477849e8d84471013c5ce7672daddf /Gemfile.lock | |
| parent | 23a87236cc36f3852c07aecad94ae540fa5de3c9 (diff) | |
| parent | a8cfb3d042239d968ce0f45e983783f3042ef883 (diff) | |
| download | rails-b49d3f105f765a2c6c440fad5303a2809942422a.tar.gz rails-b49d3f105f765a2c6c440fad5303a2809942422a.tar.bz2 rails-b49d3f105f765a2c6c440fad5303a2809942422a.zip | |
merge master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 17f0d032e3..6f1ac23a94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,10 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + amq-protocol (1.9.2) builder (3.2.2) + bunny (1.1.9) + amq-protocol (>= 1.9.2) celluloid (0.15.2) timers (~> 1.1.0) connection_pool (2.0.0) @@ -32,6 +35,7 @@ GEM mono_logger (1.1.0) multi_json (1.9.3) pg (0.17.1) + que (0.7.3) queue_classic (2.2.3) pg (~> 0.17.0) rack (1.5.2) @@ -53,18 +57,28 @@ GEM rufus-scheduler (~> 2.0) rufus-scheduler (2.0.24) tzinfo (>= 0.3.22) + serverengine (1.5.7) + sigdump (~> 0.2.2) sidekiq (3.0.2) celluloid (>= 0.15.2) connection_pool (>= 2.0.0) json redis (>= 3.0.6) redis-namespace (>= 1.3.1) + sigdump (0.2.2) sinatra (1.4.4) rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) + sneakers (0.1.1.pre) + bunny (~> 1.1.3) + serverengine + thor + thread sucker_punch (1.0.5) celluloid (~> 0.15.2) + thor (0.19.1) + thread (0.1.4) thread_safe (0.3.3) tilt (1.4.1) timers (1.1.0) @@ -79,9 +93,11 @@ PLATFORMS DEPENDENCIES activejob! delayed_job + que queue_classic rake resque resque-scheduler sidekiq + sneakers (= 0.1.1.pre) sucker_punch |