summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-05-24 16:59:24 +0800
committerMark Chao <mchao@gitlab.com>2018-06-06 21:01:43 +0900
commit8c24e78b999263b177e40d363699b4dd60c16782 (patch)
treef11284985fa03adaa1df498ffff29d670d6c1fc4 /lib
parentdc28ef0154fd31b6a284e9756a76b3c3bd4db5f4 (diff)
downloadgitlab-ce-8c24e78b999263b177e40d363699b4dd60c16782.tar.gz
wording
Diffstat (limited to 'lib')
-rw-r--r--lib/api/protected_branches.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb
index aa7cab4a741..a30eb46c220 100644
--- a/lib/api/protected_branches.rb
+++ b/lib/api/protected_branches.rb
@@ -41,10 +41,10 @@ module API
requires :name, type: String, desc: 'The name of the protected branch'
optional :push_access_level, type: Integer,
values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS,
- desc: 'Access levels allowed to push (defaults: `40`, master access level)'
+ desc: 'Access levels allowed to push (defaults: `40`, maintainer access level)'
optional :merge_access_level, type: Integer,
values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS,
- desc: 'Access levels allowed to merge (defaults: `40`, master access level)'
+ desc: 'Access levels allowed to merge (defaults: `40`, maintainer access level)'
end
post ':id/protected_branches' do
protected_branch = user_project.protected_branches.find_by(name: params[:name])