diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 11:40:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 11:41:09 +0000 |
| commit | ea1abf1e6594a726451a8116fc0b5f8ae51e6f2d (patch) | |
| tree | 529c5b6c3eed3ed393f44cbacf2f9bb263f339d0 | |
| parent | ed903367e78907253ca4319a7f22cf49cbcd048d (diff) | |
| download | gitlab-ce-ea1abf1e6594a726451a8116fc0b5f8ae51e6f2d.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-12-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 23876a9ecc9..8c94778a6f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -781,7 +781,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) @@ -1544,7 +1544,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) |