diff --git a/Gemfile b/Gemfile index dbd761d4121ebd2f30aec8f93f23f9da7a757f6d..85441f3ae23d64a90a71b910c84741ce0e421396 100644 --- a/Gemfile +++ b/Gemfile @@ -109,7 +109,7 @@ gem 'gitlab-elasticsearch-git', '~> 1.0.1', require: "elasticsearch/git" # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.0' +gem 'gitlab-markup', '~> 1.5.1' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' diff --git a/Gemfile.lock b/Gemfile.lock index 032f1e5458b27fd0357aaa0e6bbb00b89f6b5b6a..53175b0c374995d5573ea3e4657e49e69920e27f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-license (1.0.0) - gitlab-markup (1.5.0) + gitlab-markup (1.5.1) gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -887,7 +887,7 @@ DEPENDENCIES gitlab-elasticsearch-git (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-license (~> 1.0) - gitlab-markup (~> 1.5.0) + gitlab-markup (~> 1.5.1) gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) @@ -1022,4 +1022,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.6 + 1.13.7 diff --git a/changelogs/unreleased/update-gitlab-markup-gem.yml b/changelogs/unreleased/update-gitlab-markup-gem.yml new file mode 100644 index 0000000000000000000000000000000000000000..96cdfd051f09a2ba91ba5524230289c8fd0ddd42 --- /dev/null +++ b/changelogs/unreleased/update-gitlab-markup-gem.yml @@ -0,0 +1,4 @@ +--- +title: Update the gitlab-markup gem to the version 1.5.1 +merge_request: 8509 +author: