Merge branch 'master' into update-ruby

sul-dlss-deprecated · Feb 5, 2018 · cc9d885 · cc9d885
2 parents 6c776a2 + 5d45ead
commit cc9d885
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.1)
     mirador_rails (0.5.0)
       font-awesome-rails
@@ -163,8 +163,8 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     okcomputer (1.14.1)
     openseadragon (0.3.3)
       rails (> 3.2.0)
@@ -333,4 +333,4 @@ DEPENDENCIES
   uglifier
 
 BUNDLED WITH
-   1.14.6
+   1.15.4