Merge pull request rails#16890 from seuros/globalid

Bump globalid version
thedarkone · Sep 12, 2014 · 3900efb · 3900efb
2 parents 893b7b8 + ed9f71d
commit 3900efb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -38,7 +38,7 @@ def deserialize(arguments)
       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