diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-25 22:08:38 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-26 19:33:49 +0300 |
| commit | 32a80b2614b959b970a4b650c2a8886940a60b8c (patch) | |
| tree | 708a98d5ca9c7eddeecc812a9e27e959701f16b7 /CHANGELOG | |
| parent | b15d67994b817a94c53d906a21266040134b47fb (diff) | |
Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master'
Handle non-UTF-8 conflicts gracefully
## What does this MR do?
If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI.
## What are the relevant issue numbers?
Closes #21247.
See merge request !5961
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5d43fc416a8..a12174a07bf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -62,6 +62,11 @@ v 8.11.2 - Does not halt the GitHub import process when an error occurs. !5763 - Fix file links on project page when default view is Files !5933 - Fixed enter key in search input not working !5888 +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 v 8.11.1 - Pulled due to packaging error. |