move back to current delayed_job
Andrew Cantino
2 changed files with 10 additions and 15 deletions
+ 2
- 2
Gemfile
@@ -11,8 +11,8 @@ gem 'json', '>= 1.7.7' |
||
| 11 | 11 |
gem 'jsonpath' |
| 12 | 12 |
gem 'twilio-ruby' |
| 13 | 13 |
|
| 14 |
-gem 'delayed_job', :git => 'https://github.com/wok/delayed_job' # Until the YAML issues are fixed in master. |
|
| 15 |
-gem 'delayed_job_active_record', "~> 0.3.3" # newer was giving a strange MySQL error |
|
| 14 |
+gem 'delayed_job' |
|
| 15 |
+gem 'delayed_job_active_record'#, "~> 0.3.3" # newer was giving a strange MySQL error |
|
| 16 | 16 |
gem "daemons" |
| 17 | 17 |
# gem "delayed_job_web" |
| 18 | 18 |
|
+ 8
- 13
Gemfile.lock
@@ -1,10 +1,3 @@ |
||
| 1 |
-GIT |
|
| 2 |
- remote: https://github.com/wok/delayed_job |
|
| 3 |
- revision: d1f53b489a13146f6b2ac27ef26b2e2dc6ae558c |
|
| 4 |
- specs: |
|
| 5 |
- delayed_job (3.0.4) |
|
| 6 |
- activesupport (~> 3.0) |
|
| 7 |
- |
|
| 8 | 1 |
GEM |
| 9 | 2 |
remote: https://rubygems.org/ |
| 10 | 3 |
specs: |
@@ -36,7 +29,7 @@ GEM |
||
| 36 | 29 |
i18n (= 0.6.1) |
| 37 | 30 |
multi_json (~> 1.0) |
| 38 | 31 |
addressable (2.3.5) |
| 39 |
- arel (3.0.2) |
|
| 32 |
+ arel (3.0.3) |
|
| 40 | 33 |
bcrypt-ruby (3.1.1) |
| 41 | 34 |
bootstrap-kaminari-views (0.0.2) |
| 42 | 35 |
kaminari (>= 0.13) |
@@ -60,9 +53,11 @@ GEM |
||
| 60 | 53 |
crack (0.4.1) |
| 61 | 54 |
safe_yaml (~> 0.9.0) |
| 62 | 55 |
daemons (1.1.9) |
| 63 |
- delayed_job_active_record (0.3.3) |
|
| 64 |
- activerecord (>= 2.1.0, < 4) |
|
| 65 |
- delayed_job (~> 3.0) |
|
| 56 |
+ delayed_job (4.0.0) |
|
| 57 |
+ activesupport (>= 3.0, < 4.1) |
|
| 58 |
+ delayed_job_active_record (4.0.0) |
|
| 59 |
+ activerecord (>= 3.0, < 4.1) |
|
| 60 |
+ delayed_job (>= 3.0, < 4.1) |
|
| 66 | 61 |
devise (3.0.0) |
| 67 | 62 |
bcrypt-ruby (~> 3.0) |
| 68 | 63 |
orm_adapter (~> 0.1) |
@@ -270,8 +265,8 @@ DEPENDENCIES |
||
| 270 | 265 |
coffee-rails (~> 3.2.1) |
| 271 | 266 |
coveralls |
| 272 | 267 |
daemons |
| 273 |
- delayed_job! |
|
| 274 |
- delayed_job_active_record (~> 0.3.3) |
|
| 268 |
+ delayed_job |
|
| 269 |
+ delayed_job_active_record |
|
| 275 | 270 |
devise |
| 276 | 271 |
dotenv-rails |
| 277 | 272 |
em-http-request |