diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-22 11:51:45 +0300 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-06 14:57:14 +0300 |
| commit | a8b570d8bced794dcb8f6f3a1155360038d76a66 (patch) | |
| tree | 3808054bfa4dfb9d53ed713373030d61b0d2568b /lib/gitlab/access.rb | |
| parent | ddabde5446a68d4717ed8d42431a480c7a68a8a9 (diff) | |
Rename master to maintainer
Diffstat (limited to 'lib/gitlab/access.rb')
| -rw-r--r-- | lib/gitlab/access.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb index 7127948cf00..87e377de4d3 100644 --- a/lib/gitlab/access.rb +++ b/lib/gitlab/access.rb @@ -29,10 +29,10 @@ module Gitlab def options { - "Guest" => GUEST, - "Reporter" => REPORTER, - "Developer" => DEVELOPER, - "Master" => MASTER + "Guest" => GUEST, + "Reporter" => REPORTER, + "Developer" => DEVELOPER, + "Maintainer" => MASTER } end @@ -57,10 +57,10 @@ module Gitlab def protection_options { - "Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE, - "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch. Masters can push to the branch." => PROTECTION_DEV_CAN_MERGE, - "Partially protected: Both developers and masters can push new commits, but cannot force push or delete the branch." => PROTECTION_DEV_CAN_PUSH, - "Fully protected: Developers cannot push new commits, but masters can. No-one can force push or delete the branch." => PROTECTION_FULL + "Not protected: Both developers and maintainers can push new commits, force push, or delete the branch." => PROTECTION_NONE, + "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch. Maintainers can push to the branch." => PROTECTION_DEV_CAN_MERGE, + "Partially protected: Both developers and maintainers can push new commits, but cannot force push or delete the branch." => PROTECTION_DEV_CAN_PUSH, + "Fully protected: Developers cannot push new commits, but maintainers can. No-one can force push or delete the branch." => PROTECTION_FULL } end |