summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-06-04 10:38:05 +0900
committerMark Chao <mchao@gitlab.com>2018-06-06 21:01:45 +0900
commit5ee56c9afbb9c48fa009a3c6aedfd15119f0d345 (patch)
tree0ba03e60c7fd93cbd9b0d922ffd94d36e8b2c23e
parent748f8fef457f2795ab2592bf6041055cf613bb10 (diff)
downloadgitlab-ce-5ee56c9afbb9c48fa009a3c6aedfd15119f0d345.tar.gz
lock permission
-rw-r--r--app/services/lfs/unlock_file_service.rb2
-rw-r--r--locale/gitlab.pot2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/lfs/unlock_file_service.rb b/app/services/lfs/unlock_file_service.rb
index 7eb89339a92..7e3edf21d54 100644
--- a/app/services/lfs/unlock_file_service.rb
+++ b/app/services/lfs/unlock_file_service.rb
@@ -24,7 +24,7 @@ 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 maintainer access to force delete a lock'), 403)
else
error(_("%{lock_path} is locked by GitLab User %{lock_user_id}") % { lock_path: lock.path, lock_user_id: lock.user_id }, 403)
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index fe4709e5fc4..f63f2a89aa9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4764,7 +4764,7 @@ msgstr ""
msgid "You have reached your project limit"
msgstr ""
-msgid "You must have master access to force delete a lock"
+msgid "You must have maintainer access to force delete a lock"
msgstr ""
msgid "You must sign in to star a project"