diff options
Diffstat (limited to 'app/services/merge_requests/squash_service.rb')
-rw-r--r-- | app/services/merge_requests/squash_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb index 0600fd1d740..90cf4af7e41 100644 --- a/app/services/merge_requests/squash_service.rb +++ b/app/services/merge_requests/squash_service.rb @@ -5,7 +5,7 @@ module MergeRequests def execute # If performing a squash would result in no change, then # immediately return a success message without performing a squash - if merge_request.commits_count == 1 && message == merge_request.first_commit.safe_message + if merge_request.commits_count == 1 && message&.strip == merge_request.first_commit.safe_message&.strip return success(squash_sha: merge_request.diff_head_sha) end |