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

Merge branch 'shell-update' into 'master'
2d3210fd · Douwe Maan · 2e55580b · d6d61aad · 2d3210fd · 2d3210fd
Commit 2d3210fd authored Oct 10, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

GITLAB_SHELL_VERSION GITLAB_SHELL_VERSION +1 -1

No files found.
--- 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

--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-3.6.3
+3.6.4