diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 17:47:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 17:47:28 +0300 |
| commit | 901adec7f6b9d5372de49112ec388ba9007ef4d9 (patch) | |
| tree | b2b5dd538671305ff9df45b1b24a9243aab715a1 /app/services | |
| parent | 3bc07a0be9ce3b8f736890a0513283f04796b37e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-ee
Diffstat (limited to 'app/services')
| -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 |