Merge pull request #1 from satoryu/fix_nokogiri_security_issue

Update nokogiri and rack to fix its security issue
satoryu · Jul 6, 2016 · 2e50bf3 · 2e50bf3
2 parents cc88584 + e08492a
commit 2e50bf3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,4 +7,6 @@ gem 'selenium-webdriver'
 gem 'rakuten_web_service'
 gem 'dotenv'
 
-# gem "rails"
+# This version dependency is required to resolve this install issue:
+#   https://github.com/flori/json/issues/229
+gem 'json', '~> 1.8.2'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,14 +18,16 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     ffi (1.9.0)
-    json (1.8.0)
+    json (1.8.3)
     mime-types (1.24)
-    mini_portile (0.5.1)
+    mini_portile2 (2.1.0)
     multi_json (1.7.9)
     multipart-post (1.2.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rack (1.5.2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (2.0.1)
     rack-test (0.6.2)
       rack (>= 1.0)
     rakuten_web_service (0.1.0)
@@ -48,5 +50,9 @@ DEPENDENCIES
   capybara
   capybara-webkit
   dotenv
+  json (~> 1.8.2)
   rakuten_web_service
   selenium-webdriver
+
+BUNDLED WITH
+   1.10.6