Commit 2a16fff3 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'sh-update-nokogiri-1.10.9' into 'master'

Upgrade Nokogiri to v1.10.9

See merge request gitlab-org/gitlab!30435
parents 7de01b0c 7bc9a08c
......@@ -152,7 +152,7 @@ gem 'asciidoctor-plantuml', '0.0.10'
gem 'rouge', '~> 3.18.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.5'
gem 'nokogiri', '~> 1.10.9'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
......
......@@ -672,7 +672,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
......@@ -1313,7 +1313,7 @@ DEPENDENCIES
net-ldap
net-ntp
net-ssh (~> 5.2)
nokogiri (~> 1.10.5)
nokogiri (~> 1.10.9)
oauth2 (~> 1.4)
octokit (~> 4.15)
omniauth (~> 1.8)
......
---
title: Upgrade Nokogiri to v1.10.9
merge_request: 30435
author:
type: other
......@@ -8,7 +8,7 @@ gem 'rake', '~> 12.3.0'
gem 'rspec', '~> 3.7'
gem 'selenium-webdriver', '~> 3.12'
gem 'airborne', '~> 0.2.13'
gem 'nokogiri', '~> 1.10.5'
gem 'nokogiri', '~> 1.10.9'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_junit_formatter', '~> 0.4.1'
gem 'faker', '~> 1.6', '>= 1.6.6'
......
......@@ -55,7 +55,7 @@ GEM
mini_portile2 (2.4.0)
minitest (5.14.0)
netrc (0.11.0)
nokogiri (1.10.5)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
parallel (1.17.0)
parallel_tests (2.29.0)
......@@ -122,7 +122,7 @@ DEPENDENCIES
faker (~> 1.6, >= 1.6.6)
gitlab-qa
knapsack (~> 1.17)
nokogiri (~> 1.10.5)
nokogiri (~> 1.10.9)
parallel_tests (~> 2.29)
pry-byebug (~> 3.5.1)
rake (~> 12.3.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment