summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-12-14 09:04:16 +0100
committerPirate Praveen <praveen@debian.org>2018-12-21 05:49:31 +0100
commitb1bca5fcf57df2ce223e8192d1d70482fc80089a (patch)
treebb084606070f1f1c10622ed819de9e5f08a68fc3
parent55770b589c7a7c6527557952e8306355102459db (diff)
downloadgitlab-ce-b1bca5fcf57df2ce223e8192d1d70482fc80089a.tar.gz
Update minimum version of nokogiri
Fixes: ActionView::Template::Error (undefined method `add_class' for #<Nokogiri::XML::Element:0x0055dbff5252e8>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index a8bf6b2aac8..5ddd1f614f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -130,7 +130,7 @@ gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '~> 1.8.4'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
diff --git a/Gemfile.lock b/Gemfile.lock
index ed3b22a22cb..f2d265d835c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1059,7 +1059,7 @@ DEPENDENCIES
nakayoshi_fork (~> 0.0.4)
net-ldap
net-ssh (~> 5.0)
- nokogiri (~> 1.8.2)
+ nokogiri (~> 1.8.4)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)