Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
5ee56c9a
Commit
5ee56c9a
authored
Jun 04, 2018
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lock permission
parent
748f8fef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/services/lfs/unlock_file_service.rb
app/services/lfs/unlock_file_service.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/services/lfs/unlock_file_service.rb
View file @
5ee56c9a
...
@@ -24,7 +24,7 @@ module Lfs
...
@@ -24,7 +24,7 @@ module Lfs
success
(
lock:
lock
,
http_status: :ok
)
success
(
lock:
lock
,
http_status: :ok
)
elsif
forced
elsif
forced
error
(
_
(
'You must have ma
st
er access to force delete a lock'
),
403
)
error
(
_
(
'You must have ma
intain
er access to force delete a lock'
),
403
)
else
else
error
(
_
(
"%{lock_path} is locked by GitLab User %{lock_user_id}"
)
%
{
lock_path:
lock
.
path
,
lock_user_id:
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
...
...
locale/gitlab.pot
View file @
5ee56c9a
...
@@ -4764,7 +4764,7 @@ msgstr ""
...
@@ -4764,7 +4764,7 @@ msgstr ""
msgid "You have reached your project limit"
msgid "You have reached your project limit"
msgstr ""
msgstr ""
msgid "You must have ma
st
er access to force delete a lock"
msgid "You must have ma
intain
er access to force delete a lock"
msgstr ""
msgstr ""
msgid "You must sign in to star a project"
msgid "You must sign in to star a project"
...
...
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