diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-18 18:15:36 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-18 18:45:39 -0500 |
| commit | 3e7f62b50373a5751a149725f07affe092d94d2f (patch) | |
| tree | 3d18246b43dfab66c6465d8ca0e1fcd316ef9724 | |
| parent | 2f4770244d736d97b9ef15def7a70c697f7cf31a (diff) | |
| download | gitlab-ce-3e7f62b50373a5751a149725f07affe092d94d2f.tar.gz | |
Merge branch 'add-merge-conflict-changelog-item' into 'master'
Add merge conflict resolution to CHANGELOG
:blush:
See merge request !5863
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index cf98a76cdb5..29d93d84019 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.11.0 (unreleased) - Rename `markdown_preview` routes to `preview_markdown`. (Christopher Bartz) - Update to Ruby 2.3.1. !4948 - Add Issues Board !5548 + - Allow resolving merge conflicts in the UI !5479 - Improve diff performance by eliminating redundant checks for text blobs - Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi) - Convert switch icon into icon font (ClemMakesApps) |