summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 15:09:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 15:09:37 +0000
commit2c89e169769ead722394a79ed67fcd08e96863dd (patch)
tree0dadb576846c484475b895f75fab41f71cdb952e /doc
parentbd497e352ebd279536ae11855871162e82a3f88c (diff)
downloadgitlab-ce-2c89e169769ead722394a79ed67fcd08e96863dd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/administration/geo/replication/updating_the_geo_nodes.md2
-rw-r--r--doc/update/README.md4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md
index 426eb54c66a..d094ccf3e54 100644
--- a/doc/administration/geo/replication/updating_the_geo_nodes.md
+++ b/doc/administration/geo/replication/updating_the_geo_nodes.md
@@ -11,6 +11,8 @@ Updating Geo nodes involves performing:
Depending on which version of Geo you are updating to/from, there may be
different steps.
+- [Updating to GitLab 12.7](version_specific_updates.md#updating-to-gitlab-127)
+- [Updating to GitLab 12.2](version_specific_updates.md#updating-to-gitlab-122)
- [Updating to GitLab 12.1](version_specific_updates.md#updating-to-gitlab-121)
- [Updating to GitLab 10.8](version_specific_updates.md#updating-to-gitlab-108)
- [Updating to GitLab 10.6](version_specific_updates.md#updating-to-gitlab-106)
diff --git a/doc/update/README.md b/doc/update/README.md
index 9762ecffc6d..1bd2770b957 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -116,14 +116,14 @@ following command:
**For Omnibus installations**
```shell
-sudo gitlab-rails runner -e production 'puts Sidekiq::Queue.new("background_migration").size'
+sudo gitlab-rails runner -e production 'puts Gitlab::BackgroundMigration.remaining'
```
**For installations from source**
```
cd /home/git/gitlab
-sudo -u git -H bundle exec rails runner -e production 'puts Sidekiq::Queue.new("background_migration").size'
+sudo -u git -H bundle exec rails runner -e production 'puts Gitlab::BackgroundMigration.remaining'
```
## Upgrading to a new major version