diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 11:40:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 11:41:09 +0000 |
| commit | 814aa80c3a0af2b1eaa402116cff49dd14fda2dd (patch) | |
| tree | 83ab8fe9ce3fc20005b1ded130790e674a45309d | |
| parent | 6b3f0a47a2410b5a2a9fc1e78ff2d006b05a3e05 (diff) | |
| download | gitlab-ce-814aa80c3a0af2b1eaa402116cff49dd14fda2dd.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-0-stable-ee
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.11.1' +gem 'nokogiri', '~> 1.11.4' gem 'escape_utils', '~> 1.1' # Calendar rendering diff --git a/Gemfile.lock b/Gemfile.lock index ef31d72a5dd..1794a40c85c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -799,7 +799,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -1557,7 +1557,7 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.11.1) + nokogiri (~> 1.11.4) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) |