diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 20:35:39 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 20:38:46 +0300 |
| commit | aba6f19c2ab2418418f5e5e1c64dcb85a6732a01 (patch) | |
| tree | 9ce0c26cd0b30b781b0d92c389bd4680be56c5a6 /lib | |
| parent | 141ecb5afaa8ee4b4b6f76ac64f29d98b896d440 (diff) | |
Merge branch 'sh-expire-content-cache-after-import' into 'master'
Expire Wiki content cache after importing a repository
Closes #47546
See merge request gitlab-org/gitlab-ce!19617
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/sequential_importer.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/import.rake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/sequential_importer.rb b/lib/gitlab/github_import/sequential_importer.rb index 3cad919b4eb..6a181caf65d 100644 --- a/lib/gitlab/github_import/sequential_importer.rb +++ b/lib/gitlab/github_import/sequential_importer.rb @@ -42,8 +42,6 @@ module Gitlab klass.new(project, client, parallel: false).execute end - project.repository.after_import - true end end diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index aafbe52e5f8..0fd184d243f 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -50,7 +50,7 @@ class GithubImport end if import_success - @project.import_finish + @project.after_import puts "Import finished. Timings: #{timings}".color(:green) else puts "Import was not successful. Errors were as follows:" |