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

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:"