diff options
Diffstat (limited to 'app/services/merge_requests/squash_service.rb')
| -rw-r--r-- | app/services/merge_requests/squash_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb index 9d1a5d5e6d4..88ca3b4f5a8 100644 --- a/app/services/merge_requests/squash_service.rb +++ b/app/services/merge_requests/squash_service.rb @@ -10,10 +10,10 @@ module MergeRequests end if merge_request.squash_in_progress? - return error('Squash task canceled: another squash is already in progress.') + return error(s_('MergeRequests|Squash task canceled: another squash is already in progress.')) end - squash! || error('Failed to squash. Should be done manually.') + squash! || error(s_('MergeRequests|Failed to squash. Should be done manually.')) end private |