Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 13 insertions, 1 deletions

diff --git a/app/workers/gitlab/github_gists_import/finish_import_worker.rb b/app/workers/gitlab/github_gists_import/finish_import_worker.rb
index 1989b6314ea..284e5833f0c 100644
--- a/app/workers/gitlab/github_gists_import/finish_import_worker.rb
+++ b/app/workers/gitlab/github_gists_import/finish_import_worker.rb
@@ -18,14 +18,15 @@ module Gitlab
 
       INTERVAL = 30.seconds.to_i
       BLOCKING_WAIT_TIME = 5
+      GISTS_ERRORS_BY_ID = 'gitlab:github-gists-import:%{user_id}:errors'
 
       def perform(user_id, waiter_key, remaining)
         waiter = wait_for_jobs(waiter_key, remaining)
 
         if waiter.nil?
           Gitlab::GithubGistsImport::Status.new(user_id).finish!
-
           Gitlab::GithubImport::Logger.info(user_id: user_id, message: 'GitHub Gists import finished')
+          send_email_if_errors(user_id)
         else
           self.class.perform_in(INTERVAL, user_id, waiter.key, waiter.jobs_remaining)
         end
@@ -41,6 +42,17 @@ module Gitlab
 
         waiter
       end
+
+      def send_email_if_errors(user_id)
+        key = format(GISTS_ERRORS_BY_ID, user_id: user_id)
+        errors = ::Gitlab::Cache::Import::Caching.values_from_hash(key)
+
+        return if errors.blank?
+
+        Notify.github_gists_import_errors_email(user_id, errors).deliver_now
+      ensure
+        ::Gitlab::Cache::Import::Caching.expire(key, ::Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT)
+      end
     end
   end
 end