From faf59bdca85afe7a40bb8d9d8c1fc4d2e5af5060 Mon Sep 17 00:00:00 2001
From: Tan Le <tle@gitlab.com>
Date: Fri, 8 Jan 2021 12:06:55 +1100
Subject: [PATCH] Bump nokogiri gem to v1.11.1
This version delivers pre-compiled libraries for specific machine
architecture and remove the needs to compile C extension.
We also need to bump `azure-storage-blob` to 2.0.1 to support this
version bump.
---
Gemfile | 2 +-
Gemfile.lock | 21 +++++++++++++--------
qa/Gemfile | 2 +-
qa/Gemfile.lock | 10 ++++++----
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/Gemfile b/Gemfile
index 5634b465c5fc2..32aea114d8934 100644
--- a/Gemfile
+++ b/Gemfile
@@ -163,7 +163,7 @@ gem 'asciidoctor-kroki', '~> 0.2.2', require: false
gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.9'
+gem 'nokogiri', '~> 1.11.1'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e7a7696caac1..c6be12c59d003 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,13 +115,14 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
- azure-storage-blob (2.0.0)
+ azure-storage-blob (2.0.1)
azure-storage-common (~> 2.0)
- nokogiri (~> 1.10.4)
- azure-storage-common (2.0.1)
+ nokogiri (~> 1.11.0.rc2)
+ azure-storage-common (2.0.2)
faraday (~> 1.0)
faraday_middleware (~> 1.0.0.rc1)
- nokogiri (~> 1.10.4)
+ net-http-persistent (~> 4.0)
+ nokogiri (~> 1.11.0.rc2)
babosa (1.0.2)
base32 (0.3.2)
batch-loader (1.4.0)
@@ -710,7 +711,7 @@ GEM
mini_histogram (0.1.3)
mini_magick (4.10.1)
mini_mime (1.0.2)
- mini_portile2 (2.4.0)
+ mini_portile2 (2.5.0)
minitest (5.11.3)
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
@@ -733,14 +734,17 @@ GEM
nakayoshi_fork (0.0.4)
nap (1.1.0)
nenv (0.3.0)
+ net-http-persistent (4.0.0)
+ connection_pool (~> 2.2)
net-ldap (0.16.3)
net-ntp (2.1.3)
net-ssh (6.0.0)
netrc (0.11.0)
nio4r (2.5.4)
no_proxy_fix (0.1.2)
- nokogiri (1.10.10)
- mini_portile2 (~> 2.4.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
notiffany (0.1.3)
@@ -875,6 +879,7 @@ GEM
public_suffix (4.0.6)
pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6)
+ racc (1.5.2)
rack (2.2.3)
rack-accept (0.4.5)
rack (>= 0.4)
@@ -1426,7 +1431,7 @@ DEPENDENCIES
net-ldap (~> 0.16.3)
net-ntp
net-ssh (~> 6.0)
- nokogiri (~> 1.10.9)
+ nokogiri (~> 1.11.1)
oauth2 (~> 1.4)
octokit (~> 4.15)
oj (~> 3.10.6)
diff --git a/qa/Gemfile b/qa/Gemfile
index fa8fd40d5bbdb..da45ba3b9553c 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -9,7 +9,7 @@ gem 'rspec', '~> 3.7'
gem 'selenium-webdriver', '~> 3.12'
gem 'airborne', '~> 0.3.4'
gem 'rest-client', '~> 2.1.0'
-gem 'nokogiri', '~> 1.10.9'
+gem 'nokogiri', '~> 1.11.1'
gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_junit_formatter', '~> 0.4.1'
gem 'faker', '~> 1.6', '>= 1.6.6'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 2a5cd41a03c15..3b532d905261f 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -63,11 +63,12 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0425)
mini_mime (1.0.2)
- mini_portile2 (2.4.0)
+ mini_portile2 (2.5.0)
minitest (5.14.2)
netrc (0.11.0)
- nokogiri (1.10.9)
- mini_portile2 (~> 2.4.0)
+ nokogiri (1.11.1)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
parallel (1.19.2)
parallel_tests (2.29.0)
parallel
@@ -85,6 +86,7 @@ GEM
byebug (~> 9.1)
pry (~> 0.10)
public_suffix (4.0.1)
+ racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@ -155,7 +157,7 @@ DEPENDENCIES
faker (~> 1.6, >= 1.6.6)
gitlab-qa
knapsack (~> 1.17)
- nokogiri (~> 1.10.9)
+ nokogiri (~> 1.11.1)
parallel (~> 1.19)
parallel_tests (~> 2.29)
pry-byebug (~> 3.5.1)
--
GitLab