diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-10-21 06:07:36 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-10-21 06:07:36 +0000 |
| commit | 9df2115a4df5a964774128fdbbe1b3e695105536 (patch) | |
| tree | f62d9d9c477aec057727da5a7b8ab31e9dcac76e | |
| parent | b7170277c65fb76b5d0d732ab598eb475b0d823c (diff) | |
| parent | 0c0caede85b0ea6082799ae9fa6afd74a1186006 (diff) | |
| download | gitlab-ce-9df2115a4df5a964774128fdbbe1b3e695105536.tar.gz | |
Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tags' into 'master'
Fix: Backup restore doesn't clear cache
## What does this MR do?
Clears cache when we do backup restoring. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/12622
See merge request !7019
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/backup.rake | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 25f2a3777e3..10446e02d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Trim leading and trailing whitespace on project_path (Linus Thiel) - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Simpler arguments passed to named_route on toggle_award_url helper method + - Fix: Backup restore doesn't clear cache ## 8.13.0 (2016-10-22) diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index b43ee5b3383..a9f1255e8cf 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -51,6 +51,7 @@ namespace :gitlab do $progress.puts 'done'.color(:green) Rake::Task['gitlab:backup:db:restore'].invoke end + Rake::Task['gitlab:backup:repo:restore'].invoke unless backup.skipped?('repositories') Rake::Task['gitlab:backup:uploads:restore'].invoke unless backup.skipped?('uploads') Rake::Task['gitlab:backup:builds:restore'].invoke unless backup.skipped?('builds') @@ -58,6 +59,7 @@ namespace :gitlab do Rake::Task['gitlab:backup:lfs:restore'].invoke unless backup.skipped?('lfs') Rake::Task['gitlab:backup:registry:restore'].invoke unless backup.skipped?('registry') Rake::Task['gitlab:shell:setup'].invoke + Rake::Task['cache:clear'].invoke backup.cleanup end |