diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-10 12:32:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-10 12:32:39 +0000 |
| commit | 2d3210fd22b69ea71f6f073671d89c12036c8b40 (patch) | |
| tree | 80bf1f95f170f7281bd15b475998560b723bd1e9 | |
| parent | 2e55580b90d8605f0f37d9469e135354deabdb0b (diff) | |
| parent | d6d61aad7612372f350e3f56464117cf0d192411 (diff) | |
| download | gitlab-ce-2d3210fd22b69ea71f6f073671d89c12036c8b40.tar.gz | |
Merge branch 'shell-update' into 'master'
Update Gitlab Shell to fix errors moving projects between storages
## What does this MR do?
Update Gitlab Shell to fix errors moving projects between storages
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
We are unable to move projects using `ionice` because of an error in the current version of gitlab-shell. This brings the changes of https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/96 and https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/97
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Related to https://gitlab.com/gitlab-com/infrastructure/issues/513
See merge request !6751
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index e6cdc09b9c6..80a0711e715 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 8.13.0 (unreleased) - Keep refs for each deployment - Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller) - Add more tests for calendar contribution (ClemMakesApps) + - Update Gitlab Shell to fix some problems with moving projects between storages - Cache rendered markdown in the database, rather than Redis - Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references - Simplify Mentionable concern instance methods diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 4a788a01dad..0f44168a4d5 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -3.6.3 +3.6.4 |