1 files changed, 0 insertions, 17 deletions
diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb
index 31c49b3ae70..102f78c6a9b 100644
--- a/app/services/merge_requests/squash_service.rb
+++ b/app/services/merge_requests/squash_service.rb
@@ -2,8 +2,6 @@
 
 module MergeRequests
   class SquashService < MergeRequests::BaseService
-    SquashInProgressError = Class.new(RuntimeError)
-
     def execute
       # If performing a squash would result in no change, then
       # immediately return a success message without performing a squash
@@ -13,14 +11,7 @@ module MergeRequests
 
       return error(s_('MergeRequests|This project does not allow squashing commits when merge requests are accepted.')) if squash_forbidden?
 
-      if squash_in_progress?
-        return error(s_('MergeRequests|Squash task canceled: another squash is already in progress.'))
-      end
-
       squash! || error(s_('MergeRequests|Failed to squash. Should be done manually.'))
-
-    rescue SquashInProgressError
-      error(s_('MergeRequests|An error occurred while checking whether another squash is in progress.'))
     end
 
     private
@@ -35,14 +26,6 @@ module MergeRequests
       false
     end
 
-    def squash_in_progress?
-      merge_request.squash_in_progress?
-    rescue StandardError => e
-      log_error(exception: e, message: 'Failed to check squash in progress')
-
-      raise SquashInProgressError, e.message
-    end
-
     def squash_forbidden?
       target_project.squash_never?
     end