1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_strategies/from_source_branch.rb b/app/services/merge_requests/merge_strategies/from_source_branch.rb
index 9fe5fc5160b..fe0e4d8a90c 100644
--- a/app/services/merge_requests/merge_strategies/from_source_branch.rb
+++ b/app/services/merge_requests/merge_strategies/from_source_branch.rb
@@ -28,7 +28,7 @@ module MergeRequests
             check_mergeability_retry_lease: @options[:check_mergeability_retry_lease]
           )
             'Merge request is not mergeable'
-          elsif !merge_request.squash && project.squash_always?
+          elsif merge_request.missing_required_squash?
             'This project requires squashing commits when merge requests are accepted.'
           end
 
@@ -110,3 +110,5 @@ module MergeRequests
     end
   end
 end
+
+::MergeRequests::MergeStrategies::FromSourceBranch.prepend_mod