diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 21:48:51 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 21:48:51 +0300 |
| commit | ae0b888011c88f4b292b36fbc3d238a4a3458704 (patch) | |
| tree | b39b8f91071eb764fd0bde83e344b7ecab1f829c /qa | |
| parent | a71d8e19da723fe4fdd3c7d0ac7896c9d3130832 (diff) | |
| parent | 8bf78e3911962626aea6399afabe630e93ac85e9 (diff) | |
Merge branch '26375-markdown-footnotes-not-working' into 'master'
Markdown footnotes not working
Closes #26375
See merge request gitlab-org/gitlab-ce!24168
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index 75ad7bd07af..873eac1013f 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -7,4 +7,4 @@ gem 'rake', '~> 12.3.0' gem 'rspec', '~> 3.7' gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.2.13' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 55f3211482b..419cacdb2af 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -44,11 +44,11 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_mime (1.0.0) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.1) netrc (0.11.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -97,7 +97,7 @@ DEPENDENCIES airborne (~> 0.2.13) capybara (~> 2.16.1) capybara-screenshot (~> 1.0.18) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.0) pry-byebug (~> 3.5.1) rake (~> 12.3.0) rspec (~> 3.7) |