Automatic merge of gitlab-org/gitlab-ce master

3e496c21 · GitLab Bot · d9a96037 · 12217c6f · 3e496c21 · 3e496c21
Commit 3e496c21 authored Dec 21, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -140,7 +140,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

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1096,7 +1096,7 @@ DEPENDENCIES
  net-ldap
  net-ntp
  net-ssh (~> 5.0)
-  nokogiri (~> 1.8.2)
+  nokogiri (~> 1.8.4)
  oauth2 (~> 1.4)
  octokit (~> 4.9)
  omniauth (~> 1.8)