diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-06 18:00:24 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-06 18:00:24 +0300 |
| commit | e9ad837cf0f0a51e7f8035f27ad35005a828e3fd (patch) | |
| tree | 80b47c40d2d963e4609f5f4bca1c85d28cddb0f0 /app/services | |
| parent | 005bc94447373a533b5258436012474142f1ef30 (diff) | |
| parent | dd42cab9da1f4d47485a1a20e7ce055a8b39dbe1 (diff) | |
Merge branch '42751-rename-master-to-maintainer' into 'master'
Resolve "Rename the `Master` role to `Maintainer`"
Closes #42751
See merge request gitlab-org/gitlab-ce!19080
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/lfs/unlock_file_service.rb | 2 |
1 files changed, 1 insertions, 1 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 |