Merge pull request #25691 from y-yagi/test_with_latest_rescue
test with latest resque
This commit is contained in:
commit
e4edddede3
2
Gemfile
2
Gemfile
@ -40,7 +40,7 @@ gem 'listen', '~> 3.0.5', require: false
|
||||
|
||||
# Active Job.
|
||||
group :job do
|
||||
gem 'resque', '< 1.26', require: false
|
||||
gem 'resque', github: 'resque/resque', require: false
|
||||
gem 'resque-scheduler', require: false
|
||||
gem 'sidekiq', require: false
|
||||
gem 'sucker_punch', require: false
|
||||
|
19
Gemfile.lock
19
Gemfile.lock
@ -21,6 +21,17 @@ GIT
|
||||
activerecord (>= 3.0, < 5.1)
|
||||
delayed_job (>= 3.0, < 5)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/resque/resque.git
|
||||
revision: 06036388ec61e573c761ac5a25a2ef3c76537ec7
|
||||
specs:
|
||||
resque (1.27.0)
|
||||
mono_logger (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.3)
|
||||
sinatra (>= 0.9.2)
|
||||
vegas (~> 0.1.2)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/sass/sass.git
|
||||
revision: 3fda1cbe70d615e7ef96e28db4fd1f8a3ebb5505
|
||||
@ -251,12 +262,6 @@ GEM
|
||||
redis (3.3.0)
|
||||
redis-namespace (1.5.2)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
resque (1.25.2)
|
||||
mono_logger (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.3)
|
||||
sinatra (>= 0.9.2)
|
||||
vegas (~> 0.1.2)
|
||||
resque-scheduler (4.2.0)
|
||||
mono_logger (~> 1.0)
|
||||
redis (~> 3.0)
|
||||
@ -378,7 +383,7 @@ DEPENDENCIES
|
||||
rake (>= 11.1)
|
||||
redcarpet (~> 3.2.3)
|
||||
redis
|
||||
resque (< 1.26)
|
||||
resque!
|
||||
resque-scheduler
|
||||
sass!
|
||||
sass-rails
|
||||
|
Loading…
Reference in New Issue
Block a user