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

4 files changed, 11 insertions, 6 deletions

diff --git a/app/services/lfs/lock_file_service.rb b/app/services/lfs/lock_file_service.rb
index 1b283018c16..54f193c86e6 100644
--- a/app/services/lfs/lock_file_service.rb
+++ b/app/services/lfs/lock_file_service.rb
@@ -12,7 +12,7 @@ module Lfs
       error('already locked', 409, current_lock)
     rescue Gitlab::GitAccess::ForbiddenError => ex
       error(ex.message, 403)
-    rescue => ex
+    rescue StandardError => ex
       error(ex.message, 500)
     end
 
@@ -42,4 +42,4 @@ module Lfs
   end
 end
 
-Lfs::LockFileService.prepend_if_ee('EE::Lfs::LockFileService')
+Lfs::LockFileService.prepend_mod_with('Lfs::LockFileService')
diff --git a/app/services/lfs/locks_finder_service.rb b/app/services/lfs/locks_finder_service.rb
index 192ce3d3c2a..a77be643478 100644
--- a/app/services/lfs/locks_finder_service.rb
+++ b/app/services/lfs/locks_finder_service.rb
@@ -4,7 +4,7 @@ module Lfs
   class LocksFinderService < BaseService
     def execute
       success(locks: find_locks)
-    rescue => ex
+    rescue StandardError => ex
       error(ex.message, 500)
     end
 
diff --git a/app/services/lfs/push_service.rb b/app/services/lfs/push_service.rb
index 9b947fbed07..e21988aa561 100644
--- a/app/services/lfs/push_service.rb
+++ b/app/services/lfs/push_service.rb
@@ -16,12 +16,17 @@ module Lfs
       end
 
       success
-    rescue => err
+    rescue StandardError => err
+      Gitlab::ErrorTracking.log_exception(err, extra_context)
       error(err.message)
     end
 
     private
 
+    def extra_context
+      { project_id: project.id, user_id: current_user&.id }.compact
+    end
+
     # Currently we only set repository_type for design repository objects, so
     # push mirroring must send objects with a `nil` repository type - but if the
     # wiki repository uses LFS, its objects will also be sent. This will be
diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb
index a13e89904a0..7a3025ee7ea 100644
--- a/app/services/lfs/unlock_file_service.rb
+++ b/app/services/lfs/unlock_file_service.rb
@@ -12,7 +12,7 @@ module Lfs
       error(ex.message, 403)
     rescue ActiveRecord::RecordNotFound
       error(_('Lock not found'), 404)
-    rescue => ex
+    rescue StandardError => ex
       error(ex.message, 500)
     end
 
@@ -46,4 +46,4 @@ module Lfs
   end
 end
 
-Lfs::UnlockFileService.prepend_if_ee('EE::Lfs::UnlockFileService')
+Lfs::UnlockFileService.prepend_mod_with('Lfs::UnlockFileService')