summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-13 14:21:32 +0000
committerDouwe Maan <douwe@gitlab.com>2016-01-13 14:21:32 +0000
commitc7d9e7806a2cfb887533e1fab24a8340988272d4 (patch)
tree034957f410724ac5c12a17b05694bfd3b2b16f5a /CHANGELOG
parent9664424cab50ea2ac11669dc73c26f029e229fb9 (diff)
parent710659fc1fe73e4feffdb3fbb14f4098bb58046c (diff)
downloadgitlab-ce-c7d9e7806a2cfb887533e1fab24a8340988272d4.tar.gz
Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'
Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 945ad02c9e6..4221fb9df55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,7 @@ v 8.4.0 (unreleased)
- Ajax filter by message for commits page
- API: Add support for deleting a tag via the API (Robert Schilling)
- Allow subsequent validations in CI Linter
+ - Fix Encoding::CompatibilityError bug when markdown content has some complex URL (Jason Lee)
v 8.3.4
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)