Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/workers/packages/composer/cache_cleanup_worker.rb b/app/workers/packages/composer/cache_cleanup_worker.rb
index 638e50e18c4..1b95bbeb906 100644
--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -22,7 +22,7 @@ module Packages
         rescue ActiveRecord::RecordNotFound
           # ignore. likely due to object already being deleted.
         end
-      rescue => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e)
       end
     end
diff --git a/app/workers/packages/composer/cache_update_worker.rb b/app/workers/packages/composer/cache_update_worker.rb
index 664fb23284f..9d6ea25a1a5 100644
--- a/app/workers/packages/composer/cache_update_worker.rb
+++ b/app/workers/packages/composer/cache_update_worker.rb
@@ -15,7 +15,7 @@ module Packages
         return unless project
 
         Gitlab::Composer::Cache.new(project: project, name: package_name, last_page_sha: last_page_sha).execute
-      rescue => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e, project_id: project_id)
       end
     end