Merge pull request #62 from cdphp/develop

1. update nokogiri for security notice
cdphp · Jan 9, 2018 · 81eaa0a · 81eaa0a
2 parents 882d44e + 6362f47
commit 81eaa0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,7 @@ source 'https://gems.ruby-china.org/'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '>= 5.0.0.rc1', '< 5.1'
+gem 'nokogiri', '~> 1.8.1'
 # Use mysql as the database for Active Record
 gem 'mysql2'
 # Use SCSS for stylesheets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -91,16 +91,16 @@ 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)
     mini_racer (0.1.15)
       libv8 (~> 6.3)
     minitest (5.10.1)
     multi_json (1.12.1)
     mysql2 (0.4.5)
     newrelic_rpm (4.6.0.338)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     puma (3.8.2)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -200,6 +200,7 @@ DEPENDENCIES
   mini_racer
   mysql2
   newrelic_rpm
+  nokogiri (~> 1.8.1)
   puma
   rails (>= 5.0.0.rc1, < 5.1)
   react-rails (~> 2.4.3)

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "event-stream": "^3.3.4",
     "it-is": "^1.0.3",
     "json-loader": "^0.5.7",
-    "marked": "^0.3.6",
+    "marked": "^0.3.9",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
     "react-markdown": "^2.5.0",