summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-07-01 12:13:17 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-07-01 12:13:17 +0000
commit4bb41c5e966f5a9a0a5812a6448107c652354b59 (patch)
tree60a69e715fd31f48eed0d0bb4a4f79f588baf91f /CHANGELOG
parentb569f842b37434efd0cbae4b0c197391e0610b12 (diff)
parent521454831ee9e899e046ed288596865df55e8832 (diff)
downloadgitlab-ce-4bb41c5e966f5a9a0a5812a6448107c652354b59.tar.gz
Merge branch '18592-syntaxhighlighter-slow' into 'master'
Specific metrics for code on Banzai::Filter::SyntaxHighlightFilter See merge request !5038
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e2fa16e4eee..daa7ed2a1e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ v 8.10.0 (unreleased)
- Better caching of git calls on ProjectsController#show.
- Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg)
+ - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
- Add basic system information like memory and disk usage to the admin panel