diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 09:27:13 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-12-21 09:27:13 +0000 |
| commit | 12217c6f08252a86682ccc1430614a69bec84cb1 (patch) | |
| tree | c530f7bf6c3446632e8d6c4576ece1869d7d852e | |
| parent | 89b0be149ec5048ded40b53b8a94859bcdd490d8 (diff) | |
| parent | b1bca5fcf57df2ce223e8192d1d70482fc80089a (diff) | |
| download | gitlab-ce-12217c6f08252a86682ccc1430614a69bec84cb1.tar.gz | |
Merge branch 'update-nokogiri' into 'master'
Update minimum version of nokogiri in Gemfile also
See merge request gitlab-org/gitlab-ce!23829
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) |