From 7a6772c0e7acc10f4edad8ce3e6d401524ea1336 Mon Sep 17 00:00:00 2001
From: Jeremy Daer <jeremydaer@gmail.com>
Date: Thu, 17 Dec 2015 17:20:19 -0700
Subject: Use released GlobalID now that it provides
 URI::GID::MissingModelIdError for Active Job

---
 Gemfile.lock | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index 1006143f54..8db1122a09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,14 +27,6 @@ GIT
     rack (2.0.0.alpha)
       json
 
-GIT
-  remote: git://github.com/rails/globalid.git
-  revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf
-  branch: master
-  specs:
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-
 GIT
   remote: git://github.com/sass/sass.git
   revision: bce9509f396225d721501ea1070a6871b708abb1
@@ -74,7 +66,7 @@ PATH
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     activejob (5.0.0.alpha)
       activesupport (= 5.0.0.alpha)
-      globalid (>= 0.3.0)
+      globalid (>= 0.3.6)
     activemodel (5.0.0.alpha)
       activesupport (= 5.0.0.alpha)
       builder (~> 3.1)
@@ -170,6 +162,8 @@ GEM
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
     ffi (1.9.10-x86-mingw32)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     hiredis (0.5.2)
     hitimes (1.2.3)
     hitimes (1.2.3-x86-mingw32)
@@ -319,7 +313,6 @@ DEPENDENCIES
   dalli (>= 2.2.1)
   delayed_job
   delayed_job_active_record
-  globalid!
   json
   kindlerb (= 0.1.1)
   listen (~> 3.0.5)
-- 
cgit v1.2.3