Update CHANGELOG

edd30976 · Alfredo Sumaran · 6141816c · edd30976
Commit edd30976 authored Oct 12, 2016 by Alfredo Sumaran
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG CHANGELOG +2 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@ v 8.13.0 (unreleased)
  - Update runner version only when updating contacted_at
  - Add link from system note to compare with previous version
  - Use gitlab-shell v3.6.6
+  - Ability to resolve merge request conflicts with editor !6374
+  - Use gitlab-shell v3.6.2 (GIT TRACE logging)
  - Add `/projects/visible` API endpoint (Ben Boeckel)
  - Fix centering of custom header logos (Ashley Dumaine)
  - ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup