From 0c46598a899e813484a28c8ab726fb043d778af8 Mon Sep 17 00:00:00 2001 From: Markus Koller Date: Wed, 20 Sep 2017 17:41:38 +0200 Subject: Upgrade gitlab-markup gem --- Gemfile | 2 +- Gemfile.lock | 4 ++-- changelogs/unreleased/14395-upgrade-gitlab-markup.yml | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/14395-upgrade-gitlab-markup.yml diff --git a/Gemfile b/Gemfile index fa25d8ded33..c49dbca9cbc 100644 --- a/Gemfile +++ b/Gemfile @@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.5.1' +gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' diff --git a/Gemfile.lock b/Gemfile.lock index 90154d98c9c..a19d681b6c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.1) + gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -1028,7 +1028,7 @@ DEPENDENCIES gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.1) + gitlab-markup (~> 1.6.2) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) diff --git a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml new file mode 100644 index 00000000000..d1f90fe5eb1 --- /dev/null +++ b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade gitlab-markup gem +merge_request: 14395 +author: Markus Koller +type: other -- cgit v1.2.1