diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-11 08:01:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-11 08:01:51 +0000 |
| commit | 001cb7ea04f12fdd1b6d50fba6946f79c2f5c256 (patch) | |
| tree | f292c033d0d8ad7f2d6c2117c24fc5071e95ef17 /Gemfile | |
| parent | 54a6ca6f38764dd1a863d0035af9541b5a52c583 (diff) | |
| parent | 6e14ea42b8d92085cbf67068b70e9ccfffaa67a4 (diff) | |
| download | gitlab-ce-001cb7ea04f12fdd1b6d50fba6946f79c2f5c256.tar.gz | |
Merge branch 'upgrade-gitlab-markup' into 'master'
Upgrade gitlab-markup to fix render issue with reStructuredText
See merge request gitlab-org/gitlab-ce!19596
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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' |