aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-01-29 09:05:06 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-01-29 09:05:06 +0900
commit6a1c0218df1fcffaac97e7288db07934bfef277f (patch)
tree6c32c53c7b814f68ec7fe08455b3bedd416903a6
parent17848036ad1c4960924055030f0b70c5ca45ac6c (diff)
downloadrails-6a1c0218df1fcffaac97e7288db07934bfef277f.tar.gz
rails-6a1c0218df1fcffaac97e7288db07934bfef277f.tar.bz2
rails-6a1c0218df1fcffaac97e7288db07934bfef277f.zip
delayed_job and delayed_job_active_record gems with AR5 support are available
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock24
2 files changed, 9 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index 2a42a4aea0..073a5b9c27 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ group :job do
gem "resque-scheduler", require: false
gem "sidekiq", require: false
gem "sucker_punch", require: false
- gem "delayed_job", require: false, github: "collectiveidea/delayed_job"
+ gem "delayed_job", require: false
gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
gem "sneakers", require: false
gem "que", require: false
@@ -68,7 +68,7 @@ group :job do
#TODO: add qu after it support Rails 5.1
# gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
gem "qu-redis", require: false
- gem "delayed_job_active_record", require: false, github: "collectiveidea/delayed_job_active_record"
+ gem "delayed_job_active_record", require: false
gem "sequel", require: false
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 4550d0425b..049d7320b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,21 +7,6 @@ GIT
pg (>= 0.17, < 0.20)
GIT
- remote: https://github.com/collectiveidea/delayed_job.git
- revision: e3772d4f0c8470d0fcba00c86ca3bc4f5e876830
- specs:
- delayed_job (4.1.2)
- activesupport (>= 3.0, < 5.1)
-
-GIT
- remote: https://github.com/collectiveidea/delayed_job_active_record.git
- revision: 36f434c4fd660e8f11ce932be117e9c71dde7212
- specs:
- delayed_job_active_record (4.1.1)
- activerecord (>= 3.0, < 5.1)
- delayed_job (>= 3.0, < 5)
-
-GIT
remote: https://github.com/matthewd/rb-inotify.git
revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40
branch: close-handling
@@ -167,6 +152,11 @@ GEM
daemons (1.2.4)
dalli (2.7.6)
dante (0.2.0)
+ delayed_job (4.1.2)
+ activesupport (>= 3.0, < 5.1)
+ delayed_job_active_record (4.1.1)
+ activerecord (>= 3.0, < 5.1)
+ delayed_job (>= 3.0, < 5)
em-hiredis (0.3.1)
eventmachine (~> 1.0)
hiredis (~> 0.6.0)
@@ -388,8 +378,8 @@ DEPENDENCIES
byebug
coffee-rails
dalli (>= 2.2.1)
- delayed_job!
- delayed_job_active_record!
+ delayed_job
+ delayed_job_active_record
em-hiredis
erubis (~> 2.7.0)
hiredis