diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
commit | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch) | |
tree | 64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /doc/update | |
parent | 6044caed20964a70c1ac6c5a3365d567ed96dfde (diff) | |
download | gitlab-ce-0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
-rw-r--r-- | doc/update/README.md | 2 | ||||
-rw-r--r-- | doc/update/restore_after_failure.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/README.md b/doc/update/README.md index b183df22589..a72e0e1e6ae 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -147,7 +147,7 @@ puts Sidekiq::Queue.new("background_migration").size Sidekiq::ScheduledSet.new.select { |r| r.klass == 'BackgroundMigrationWorker' }.size ``` -There is also a [rake task](../administration/raketasks/maintenance.md#display-status-of-database-migrations) +There is also a [Rake task](../administration/raketasks/maintenance.md#display-status-of-database-migrations) for displaying the status of each database migration. ## Upgrading to a new major version diff --git a/doc/update/restore_after_failure.md b/doc/update/restore_after_failure.md index 99329fdceb3..e01ae409bb3 100644 --- a/doc/update/restore_after_failure.md +++ b/doc/update/restore_after_failure.md @@ -45,7 +45,7 @@ need to do. ### GitLab 8.6+ -Pass the version to a database rake task to manually mark the migration as +Pass the version to a database Rake task to manually mark the migration as complete. ```shell @@ -56,7 +56,7 @@ sudo -u git -H bundle exec rake gitlab:db:mark_migration_complete[20151103134857 sudo gitlab-rake gitlab:db:mark_migration_complete[20151103134857] ``` -Once the migration is successfully marked, run the rake `db:migrate` task again. +Once the migration is successfully marked, run the Rake `db:migrate` task again. You will likely have to repeat this process several times until all failed migrations are marked complete. @@ -77,6 +77,6 @@ ActiveRecord::Base.connection.execute("INSERT INTO schema_migrations (version) V exit ``` -Once the migration is successfully marked, run the rake `db:migrate` task again. +Once the migration is successfully marked, run the Rake `db:migrate` task again. You will likely have to repeat this process several times until all failed migrations are marked complete. |