Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests

* upstream/master: (147 commits)
  Replace the `project/issues/issues.feature` spinach test with an rspec analog
  [Rails5] Isolate `test_after_commit` gem
  backport missing object storage worker specs
  Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown"
  Add button type to settings toggle
  Move Sidekiq exporter logs to log/sidekiq_exporter.log
  Rename allow_private_networks to allow_local_network
  Make error messages even more descriptive
  Added rescue to show a custom error when testing project integrations
  Raise more descriptive errors when URLs are blocked
  Backport changes in EE MR 4972: System Header and Footer
  Adds validators and rack cookie helper
  apply feedback
  add changelog
  fix the rake task from being to strict about Group
  Bump html-pipeline to 2.7.1
  Update docs for API for issue and merge request description templates
  Add pagination docs to commit status API
  Update brakeman 3.6.1 to 4.2.1
  Handle CR-LFs properly in .gitmodules file
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/update/10.5-to-10.6.md b/doc/update/10.5-to-10.6.md
index f5c5c305726..2f90fb62c4a 100644
--- a/doc/update/10.5-to-10.6.md
+++ b/doc/update/10.5-to-10.6.md
@@ -103,7 +103,7 @@ rm go1.8.3.linux-amd64.tar.gz
 ```bash
 cd /home/git/gitlab
 
-sudo -u git -H git fetch --all
+sudo -u git -H git fetch --all --prune
 sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
 sudo -u git -H git checkout -- locale
 ```
@@ -131,7 +131,7 @@ sudo -u git -H git checkout 10-6-stable-ee
 ```bash
 cd /home/git/gitlab-shell
 
-sudo -u git -H git fetch --all --tags
+sudo -u git -H git fetch --all --tags --prune
 sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION)
 sudo -u git -H bin/compile
 ```
@@ -146,7 +146,7 @@ If you are not using Linux you may have to run `gmake` instead of
 ```bash
 cd /home/git/gitlab-workhorse
 
-sudo -u git -H git fetch --all --tags
+sudo -u git -H git fetch --all --tags --prune
 sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_WORKHORSE_VERSION)
 sudo -u git -H make
 ```
@@ -182,7 +182,7 @@ sudo -u git -H sed -i.pre-10.1 's/\[\[storages\]\]/[[storage]]/' /home/git/gital
 
 ```shell
 cd /home/git/gitaly
-sudo -u git -H git fetch --all --tags
+sudo -u git -H git fetch --all --tags --prune
 sudo -u git -H git checkout v$(</home/git/gitlab/GITALY_SERVER_VERSION)
 sudo -u git -H make
 ```