diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-05 10:01:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-05 10:01:59 +0000 |
| commit | de01353b166018a43ea92b38054b1267c3ba5cea (patch) | |
| tree | bb15a9159145bc35051f3c0419b484f902feb3fc | |
| parent | da522efa1a46241bb5828420382174fed0a20a00 (diff) | |
| parent | 352b074906c7585a2dd69cd125bfbb3542b32166 (diff) | |
| download | gitlab-ce-de01353b166018a43ea92b38054b1267c3ba5cea.tar.gz | |
Merge branch 'rs-qa-update-nokogiri' into 'master'
Update QA Nokogiri to 1.8.1
See merge request gitlab-org/gitlab-ce!14700
| -rw-r--r-- | qa/Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 95aeef10752..22d12b479cb 100644 --- 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) - nokogiri (1.7.0.1) - mini_portile2 (~> 2.1.0) + mini_portile2 (2.3.0) + nokogiri (1.8.1) + 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 |