Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 3 insertions, 3 deletions

diff --git a/app/services/pages/migrate_from_legacy_storage_service.rb b/app/services/pages/migrate_from_legacy_storage_service.rb
index b6aa08bba01..d102f93e863 100644
--- a/app/services/pages/migrate_from_legacy_storage_service.rb
+++ b/app/services/pages/migrate_from_legacy_storage_service.rb
@@ -59,7 +59,7 @@ module Pages
       end
 
       @logger.info(message: "Pages legacy storage migration: batch processed", migrated: @migrated, errored: @errored)
-    rescue => e
+    rescue StandardError => e
       # This method should never raise exception otherwise all threads might be killed
       # and this will result in queue starving (and deadlock)
       Gitlab::ErrorTracking.track_exception(e)
@@ -81,7 +81,7 @@ module Pages
         @logger.error(message: "Pages legacy storage migration: project failed to be migrated: #{result[:message]}", project_id: project.id, pages_path: project.pages_path, duration: time.round(2))
         @counters_lock.synchronize { @errored += 1 }
       end
-    rescue => e
+    rescue StandardError => e
       @counters_lock.synchronize { @errored += 1 }
       @logger.error(message: "Pages legacy storage migration: project failed to be migrated: #{result[:message]}", project_id: project&.id, pages_path: project&.pages_path)
       Gitlab::ErrorTracking.track_exception(e, project_id: project&.id)
diff --git a/app/services/pages/zip_directory_service.rb b/app/services/pages/zip_directory_service.rb
index 6cb79452e1b..895614a84a0 100644
--- a/app/services/pages/zip_directory_service.rb
+++ b/app/services/pages/zip_directory_service.rb
@@ -31,7 +31,7 @@ module Pages
       end
 
       success(archive_path: output_file, entries_count: entries_count)
-    rescue => e
+    rescue StandardError => e
       FileUtils.rm_f(output_file) if output_file
       raise e
     end