diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-18 18:15:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-18 18:15:36 +0000 |
| commit | fd07cb6383d3b9231515173f51b94f642d487b3b (patch) | |
| tree | 1a49907e26674aa12d64bb0863237ab39d19310e /CHANGELOG | |
| parent | 027a4eff98bd434ba8e278ae37e4851e59f7c8d6 (diff) | |
| parent | f15f88f9a7c59e1c55191b2d7035e8373db629ec (diff) | |
| download | gitlab-ce-fd07cb6383d3b9231515173f51b94f642d487b3b.tar.gz | |
Merge branch 'add-merge-conflict-changelog-item' into 'master'
Add merge conflict resolution to CHANGELOG
:blush:
See merge request !5863
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5f4a59745f4..b21f376d863 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,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) |