summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-11 08:01:51 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-11 08:01:51 +0000
commit001cb7ea04f12fdd1b6d50fba6946f79c2f5c256 (patch)
treef292c033d0d8ad7f2d6c2117c24fc5071e95ef17 /Gemfile.lock
parent54a6ca6f38764dd1a863d0035af9541b5a52c583 (diff)
parent6e14ea42b8d92085cbf67068b70e9ccfffaa67a4 (diff)
downloadgitlab-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.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
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)