Merge branch 'rs-qa-update-nokogiri' into 'master'

Update QA Nokogiri to 1.8.1 See merge request gitlab-org/gitlab-ce!14700

Merge branch 'rs-qa-update-nokogiri' into 'master'
Update QA Nokogiri to 1.8.1 See merge request gitlab-org/gitlab-ce!14700
de01353b · Grzegorz Bizon · da522efa · 352b0749 · de01353b
Commit de01353b authored Oct 05, 2017 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

qa/Gemfile.lock qa/Gemfile.lock +4 -4

No files found.
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -25,9 +25,9 @@ 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)
-    nokogiri (1.7.0.1)
+    nokogiri (1.8.1)
-      mini_portile2 (~> 2.1.0)
+      mini_portile2 (~> 2.3.0)
    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
@@ -75,4 +75,4 @@ DEPENDENCIES
  selenium-webdriver (~> 2.53)
 BUNDLED WITH
-   1.14.6
+   1.15.4