diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 00:12:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 00:12:30 +0000 |
| commit | 0029f2d7d01d4e31bf64314953225f7625ed28ae (patch) | |
| tree | 7e5c9e32515cfef5e1d7db3ce8943a5bf25c692b | |
| parent | 012d9355c5f498d75f1e98b71607573cfd50a197 (diff) | |
| download | gitlab-ce-0029f2d7d01d4e31bf64314953225f7625ed28ae.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@14-8-stable-ee
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -153,7 +153,7 @@ gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.8.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.2' +gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' diff --git a/Gemfile.lock b/Gemfile.lock index 51d85fa92fb..7fc880f6c9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.2) + commonmarker (0.23.4) concurrent-ruby (1.1.9) connection_pool (2.2.5) contracts (0.11.0) @@ -1415,7 +1415,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.2) + commonmarker (~> 0.23.4) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) |