Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
e6c1f2ac7bf1
Commit
6d0a22f2
authored
May 17, 2018
by
Robert Speicher
Browse files
Bring CE-EE parity to app/services/lfs/unlock_file_service.rb
parent
d3b31c4c1c0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/services/lfs/unlock_file_service.rb
View file @
e6c1f2ac
...
...
@@ -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 @@ def unlock_file
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment