Rename master to maintainer
This commit is contained in:
parent
ddabde5446
commit
a8b570d8bc
|
@ -5,7 +5,7 @@ class ProtectedBranch < ActiveRecord::Base
|
||||||
protected_ref_access_levels :merge, :push
|
protected_ref_access_levels :merge, :push
|
||||||
|
|
||||||
def self.protected_ref_accessible_to?(ref, user, project:, action:, protected_refs: nil)
|
def self.protected_ref_accessible_to?(ref, user, project:, action:, protected_refs: nil)
|
||||||
# Masters, owners and admins are allowed to create the default branch
|
# Maintainers, owners and admins are allowed to create the default branch
|
||||||
if default_branch_protected? && project.empty_repo?
|
if default_branch_protected? && project.empty_repo?
|
||||||
return true if user.admin? || project.team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
|
return true if user.admin? || project.team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
|
||||||
end
|
end
|
||||||
|
|
|
@ -29,10 +29,10 @@ module Gitlab
|
||||||
|
|
||||||
def options
|
def options
|
||||||
{
|
{
|
||||||
"Guest" => GUEST,
|
"Guest" => GUEST,
|
||||||
"Reporter" => REPORTER,
|
"Reporter" => REPORTER,
|
||||||
"Developer" => DEVELOPER,
|
"Developer" => DEVELOPER,
|
||||||
"Master" => MASTER
|
"Maintainer" => MASTER
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ module Gitlab
|
||||||
|
|
||||||
def protection_options
|
def protection_options
|
||||||
{
|
{
|
||||||
"Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE,
|
"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. Masters can push to the branch." => PROTECTION_DEV_CAN_MERGE,
|
"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 masters can push new commits, but cannot force push or delete the branch." => PROTECTION_DEV_CAN_PUSH,
|
"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 masters can. No-one can force push or delete the branch." => PROTECTION_FULL
|
"Fully protected: Developers cannot push new commits, but maintainers can. No-one can force push or delete the branch." => PROTECTION_FULL
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue