Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 7 insertions, 0 deletions

diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb
index 4b04d42b48e..faa2e921581 100644
--- a/app/services/merge_requests/squash_service.rb
+++ b/app/services/merge_requests/squash_service.rb
@@ -11,11 +11,14 @@ module MergeRequests
         return success(squash_sha: merge_request.diff_head_sha)
       end
 
+      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
@@ -40,6 +43,10 @@ module MergeRequests
       raise SquashInProgressError, e.message
     end
 
+    def squash_forbidden?
+      target_project.squash_never?
+    end
+
     def repository
       target_project.repository
     end