From ed9f71d11a4b0b235b3bab1e38278b50dfe77e21 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Fri, 12 Sep 2014 08:28:20 +0000 Subject: [PATCH] Bump globalid version --- activejob/activejob.gemspec | 2 +- 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 @@ 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 @@ 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 -- GitLab