diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-12 18:53:29 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | edd30976bd8069a02e0674ee36d1455c06ea751f (patch) | |
| tree | 559312526640babed9c7c09d137f150efdb03c15 | |
| parent | 6141816c233d87888d1450d3bc48a28fc6044ec1 (diff) | |
| download | gitlab-ce-edd30976bd8069a02e0674ee36d1455c06ea751f.tar.gz | |
Update CHANGELOG
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 99bbd99726d..f0b250f365c 100644 --- 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 |