diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 10:56:08 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 10:56:08 +0200 |
| commit | dc20f7d4d40648e9a5af999a6436a5130ddad607 (patch) | |
| tree | 1adac42a96f52fd3e4d67edffd1412e5515b0fb7 /Gemfile.lock | |
| parent | c334bea36228319b3f624443f303447e48e29f3d (diff) | |
| parent | e06e64efd3ebf6e3351cd490f55273bd2e756b0b (diff) | |
| download | rails-dc20f7d4d40648e9a5af999a6436a5130ddad607.tar.gz rails-dc20f7d4d40648e9a5af999a6436a5130ddad607.tar.bz2 rails-dc20f7d4d40648e9a5af999a6436a5130ddad607.zip | |
Merge branch 'master' of github.com:rails/activejob
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 51a3812ad9..7005cc4d46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,8 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) connection_pool (2.0.0) + delayed_job (4.0.1) + activesupport (>= 3.0, < 4.2) i18n (0.6.9) json (1.8.1) minitest (5.3.4) @@ -58,6 +60,7 @@ PLATFORMS DEPENDENCIES activejob! + delayed_job resque sidekiq sucker_punch |