diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-13 07:38:01 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-13 07:38:01 +0000 |
| commit | 23a2a8ef3187f904cddccfd01ea8634f1f7bc8bc (patch) | |
| tree | 3a966c213b49754bcc79f6f4d649ce1b0a470e01 | |
| parent | 21e3712a07987f0a58282daf58f3e6aa66dd68fc (diff) | |
| parent | dd3934f7a2fdcafd6607d893da15c9a195065d54 (diff) | |
| download | gitlab-ce-23a2a8ef3187f904cddccfd01ea8634f1f7bc8bc.tar.gz | |
Merge branch 'update-gitlab-shell' into 'master'
Update to gitlab-shell 3.6.6
## What does this MR do?
This updates gitlab-shell to version 3.6.6
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !6830
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index ab04c55b451..adada3b0d02 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ v 8.13.0 (unreleased) - Truncate long labels with ellipsis in labels page - Update runner version only when updating contacted_at - Add link from system note to compare with previous version - - Use gitlab-shell v3.6.2 (GIT TRACE logging) + - Use gitlab-shell v3.6.6 - 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 diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 0f44168a4d5..4f2c1d15f6d 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -3.6.4 +3.6.6 |