diff options
| author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-27 15:31:52 -0500 |
|---|---|---|
| committer | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-01-27 15:31:52 -0500 |
| commit | cadb8af32dbb8877b096e7f69c401c34260dc902 (patch) | |
| tree | 43bb4a0c623b516a3df3a31fa7a896fccaee48b3 /Gemfile.lock | |
| parent | e5e42a3687801a1dc1c3e36ea784a7a1479a9230 (diff) | |
| parent | a9a64c490dd5f5038b05338debe439855323afb5 (diff) | |
| download | rails-cadb8af32dbb8877b096e7f69c401c34260dc902.tar.gz rails-cadb8af32dbb8877b096e7f69c401c34260dc902.tar.bz2 rails-cadb8af32dbb8877b096e7f69c401c34260dc902.zip | |
Merge pull request #23284 from maclover7/suckerpunch-2
Update ActiveJob adapter for sucker_punch 2.0
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7d2844ae89..67a0832dfa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM bunny (2.2.1) amq-protocol (>= 2.0.0) byebug (8.2.1) - celluloid (0.17.2) + celluloid (0.17.3) celluloid-essentials celluloid-extras celluloid-fsm @@ -155,7 +155,6 @@ GEM activesupport (>= 4.1.0) hiredis (0.5.2) hitimes (1.2.3) - hitimes (1.2.3-x86-mingw32) i18n (0.7.0) jquery-rails (4.0.5) rails-dom-testing (~> 1.0) @@ -263,8 +262,8 @@ GEM sqlite3 (1.3.11-x64-mingw32) sqlite3 (1.3.11-x86-mingw32) stackprof (0.2.7) - sucker_punch (1.6.0) - celluloid (~> 0.17.2) + sucker_punch (2.0.0) + concurrent-ruby (~> 1.0.0) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) @@ -302,6 +301,7 @@ DEPENDENCIES bcrypt-ruby (~> 3.0.0) benchmark-ips byebug + celluloid coffee-rails (~> 4.1.0) dalli (>= 2.2.1) delayed_job @@ -337,7 +337,7 @@ DEPENDENCIES sneakers sqlite3 (~> 1.3.6) stackprof - sucker_punch (< 2.0) + sucker_punch turbolinks tzinfo-data uglifier (>= 1.3.0) |