diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 11:00:50 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 11:00:50 +0100 |
| commit | f15f88f9a7c59e1c55191b2d7035e8373db629ec (patch) | |
| tree | ca78c39cdc5ab11f97b762b99a5f36d205732fe9 | |
| parent | 2c1062f81e3c39cf8a45185c203995a43b91bf65 (diff) | |
| download | gitlab-ce-add-merge-conflict-changelog-item.tar.gz | |
Add merge conflict resolution to CHANGELOGadd-merge-conflict-changelog-item
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 61c654002ad..4e7e2971a4e 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) |