summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-09 11:44:08 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-09 11:44:08 +0000
commitaacde42d55cb485413ced7eb64c396c47e58fa47 (patch)
treeb67458e3113a43ab489b08fc63e163dd6df89d5f /CHANGELOG
parentceb342c71648d8055b1dc2c8909a563f82edfcef (diff)
parent89b3ddd609063d93f39a02279f0f3e23b8b6b364 (diff)
downloadgitlab-ce-aacde42d55cb485413ced7eb64c396c47e58fa47.tar.gz
Merge branch 'rs-broadcast-markdown' into 'master'
Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9245895bf0c..c0562feafca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ v 8.5.0 (unreleased)
- Track project import failure
- Support Two-factor Authentication for LDAP users
- Display database type and version in Administration dashboard
+ - Allow limited Markdown in Broadcast Messages
- Fix visibility level text in admin area (Zeger-Jan van de Weg)
- Warn admin during OAuth of granting admin rights (Zeger-Jan van de Weg)
- Update the ExternalIssue regex pattern (Blake Hitchcock)