diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-12 13:11:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-12 13:11:07 -0300 |
| commit | 3900efb9a4e71fbd1fc1c69b3509ec655aae5f7e (patch) | |
| tree | 5b611149b57df8429e7b90b2f316600b722307ed /activejob | |
| parent | 893b7b8b0cd8a3d437f550fcd86672a191bf61c0 (diff) | |
| parent | ed9f71d11a4b0b235b3bab1e38278b50dfe77e21 (diff) | |
| download | rails-3900efb9a4e71fbd1fc1c69b3509ec655aae5f7e.tar.gz rails-3900efb9a4e71fbd1fc1c69b3509ec655aae5f7e.tar.bz2 rails-3900efb9a4e71fbd1fc1c69b3509ec655aae5f7e.zip | |
Merge pull request #16890 from seuros/globalid
Bump globalid version
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/activejob.gemspec | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/arguments.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activejob/activejob.gemspec b/activejob/activejob.gemspec index 9944b2a1bd..a9be2a8f00 100644 --- a/activejob/activejob.gemspec +++ b/activejob/activejob.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.add_dependency 'activesupport', version - s.add_dependency 'globalid', '>= 0.2.3' + s.add_dependency 'globalid', '>= 0.3.0' end diff --git a/activejob/lib/active_job/arguments.rb b/activejob/lib/active_job/arguments.rb index 69a4ad928d..175a2f0956 100644 --- a/activejob/lib/active_job/arguments.rb +++ b/activejob/lib/active_job/arguments.rb @@ -38,7 +38,7 @@ module ActiveJob def serialize_argument(argument) case argument when GlobalID::Identification - argument.global_id.to_s + argument.to_global_id.to_s when *TYPE_WHITELIST argument when Array |