diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-05-17 11:43:54 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-05-17 11:43:54 -0500 |
| commit | bd2b57d20bc92db8fa601abcc8360d37c94a716c (patch) | |
| tree | 34f936eb6b5fcd804218d2b2efbf65acc3fa46b5 | |
| parent | be54edbfd31e49b5d01f9130591b9ab8579081ab (diff) | |
| download | gitlab-ce-rs-unlock-file-service-parity.tar.gz | |
Bring CE-EE parity to app/services/lfs/unlock_file_service.rbrs-unlock-file-service-parity
| -rw-r--r-- | app/services/lfs/unlock_file_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb index 6c93dc69bb0..7eb89339a92 100644 --- a/app/services/lfs/unlock_file_service.rb +++ b/app/services/lfs/unlock_file_service.rb @@ -2,14 +2,14 @@ module Lfs class UnlockFileService < BaseService def execute unless can?(current_user, :push_code, project) - raise Gitlab::GitAccess::UnauthorizedError, 'You have no permissions' + raise Gitlab::GitAccess::UnauthorizedError, _('You have no permissions') end unlock_file rescue Gitlab::GitAccess::UnauthorizedError => ex error(ex.message, 403) rescue ActiveRecord::RecordNotFound - error('Lock not found', 404) + error(_('Lock not found'), 404) rescue => ex error(ex.message, 500) end @@ -24,9 +24,9 @@ module Lfs success(lock: lock, http_status: :ok) elsif forced - error('You must have master access to force delete a lock', 403) + error(_('You must have master access to force delete a lock'), 403) else - error("#{lock.path} is locked by GitLab User #{lock.user_id}", 403) + error(_("%{lock_path} is locked by GitLab User %{lock_user_id}") % { lock_path: lock.path, lock_user_id: lock.user_id }, 403) end end |