diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2019-01-30 05:10:37 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-01-31 04:56:51 +0000 |
| commit | e33e3d29ae56ddd10b66513c35f3e318ea375cb9 (patch) | |
| tree | ce5d1515f93c1e38a01c95b5e0f07f1b572f3763 /app/services/merge_requests/squash_service.rb | |
| parent | b5f089f2b7100dffb1a346e95022f88e6ff06415 (diff) | |
| download | gitlab-ce-i18n-cop.tar.gz | |
Autofixed some untranslated stringsi18n-cop
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 a439a380255..d97326fbdfa 100644 --- a/app/services/merge_requests/squash_service.rb +++ b/app/services/merge_requests/squash_service.rb @@ -6,7 +6,7 @@ module MergeRequests @merge_request = merge_request @repository = target_project.repository - squash || error('Failed to squash. Should be done manually.') + squash || error(_('Failed to squash. Should be done manually.')) end def squash @@ -15,7 +15,7 @@ module MergeRequests end if merge_request.squash_in_progress? - return error('Squash task canceled: another squash is already in progress.') + return error(_('Squash task canceled: another squash is already in progress.')) end squash_sha = repository.squash(current_user, merge_request) |