summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 518e80a360a..05517de501a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,9 @@ v 8.12.0 (unreleased)
- Added tests for diff notes
- Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
+v 8.11.3 (unreleased)
+ - Don't try to show merge conflict resolution info if a merge conflict contains non-UTF-8 characters
+
v 8.11.2 (unreleased)
- Show "Create Merge Request" widget for push events to fork projects on the source project