Merge pull request #312 from ucsdlib/feature/upgrade_gem

#310 - Updated vulnerabilities
ucsdlib · May 25, 2017 · eeab34b · eeab34b
2 parents e421914 + 08c38ff
commit eeab34b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -39,7 +39,7 @@ gem "i18n", '~> 0.8.1'
 gem "bootstrap-sass", '~> 2.3.2.2' # locked because blacklight 4.7
 gem "bower-rails", "~> 0.11.0"
 gem "responders", "~> 2.4.0"
-gem 'nokogiri', '1.7.1'
+gem 'nokogiri', '1.7.2'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem 'therubyracer', '~> 0.12.3', :platforms => :ruby

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -218,7 +218,7 @@ GEM
     net-ssh (4.1.0)
     netrc (0.10.3)
     newrelic_rpm (4.1.0.333)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     nom-xml (0.5.3)
       activesupport (>= 3.2.18)
@@ -457,7 +457,7 @@ DEPENDENCIES
   logstash-event (= 1.2.02)
   minitest (~> 5.10.2)
   newrelic_rpm (= 4.1.0.333)
-  nokogiri (= 1.7.1)
+  nokogiri (= 1.7.2)
   omniauth (~> 1.3.1)
   omniauth-shibboleth (~> 1.2.1)
   poltergeist (= 1.15.0)