diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:56:48 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:56:48 +0200 |
| commit | 66ff67b063f2c8d06f40625595c4208c33ffd1f1 (patch) | |
| tree | 5a680f44a1c028aa323c8d7541726e7d5881aeb2 /CHANGELOG.md | |
| parent | 829a708a970b31afdcda21fff072eda0c61dfd4c (diff) | |
| parent | 4e6af0c3fa335d138343dce3e0216303a9b1cd79 (diff) | |
| download | gitlab-ce-66ff67b063f2c8d06f40625595c4208c33ffd1f1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c39c726c8d4..a3849325149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Please view this file on the master branch, on stable branches it's out of date. - 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 - 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 |