diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-11 11:01:51 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-11 11:01:51 +0300 |
| commit | 001cb7ea04f12fdd1b6d50fba6946f79c2f5c256 (patch) | |
| tree | f292c033d0d8ad7f2d6c2117c24fc5071e95ef17 | |
| parent | 54a6ca6f38764dd1a863d0035af9541b5a52c583 (diff) | |
| parent | 6e14ea42b8d92085cbf67068b70e9ccfffaa67a4 (diff) | |
Merge branch 'upgrade-gitlab-markup' into 'master'
Upgrade gitlab-markup to fix render issue with reStructuredText
See merge request gitlab-org/gitlab-ce!19596
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/upgrade-gitlab-markup.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -134,7 +134,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.7.1' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.2' +gem 'gitlab-markup', '~> 1.6.4' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' diff --git a/Gemfile.lock b/Gemfile.lock index 0a4dbdc0581..aa8e271673c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.3) + gitlab-markup (1.6.4) gitlab-styles (2.3.2) rubocop (~> 0.51) rubocop-gitlab-security (~> 0.1.0) @@ -1044,7 +1044,7 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.2) + gitlab-markup (~> 1.6.4) gitlab-styles (~> 2.3) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) diff --git a/changelogs/unreleased/upgrade-gitlab-markup.yml b/changelogs/unreleased/upgrade-gitlab-markup.yml new file mode 100644 index 00000000000..9b0eaa7068d --- /dev/null +++ b/changelogs/unreleased/upgrade-gitlab-markup.yml @@ -0,0 +1,5 @@ +--- +title: Fix extra blank line at start of rendered reStructuredText code block +merge_request: 19596 +author: +type: fixed |