summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-21 08:49:15 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-21 08:49:15 +0000
commitac044ba0d53f17833f0aa97db404e9b49c9b219a (patch)
treef317478e268f103bbf4044bd5650cfc1b7af649f /changelogs
parent39b90bcec48f26a5a8c1eea468ffca7d89097f8b (diff)
parent0c46598a899e813484a28c8ab726fb043d778af8 (diff)
downloadgitlab-ce-ac044ba0d53f17833f0aa97db404e9b49c9b219a.tar.gz
Merge branch 'feature/plantuml-restructured-text' into 'master'
Upgrade gitlab-markup gem See merge request gitlab-org/gitlab-ce!14395
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/14395-upgrade-gitlab-markup.yml5
1 files changed, 5 insertions, 0 deletions
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