Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

设置

This commit is contained in:
caishi 2021-02-26 15:40:44 +08:00
parent e469ddae24
commit d01e8e32d4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/forge/Settings/BranchRule.jsx
View File

@ -125,7 +125,7 @@ export default Form.create()(
<Checkbox checked={protect} onChange={changeProtect}>
启用分支保护<span className="color-grey-9 ml5 font-12">组织删除并限制Git推送和合并到分支</span>
</Checkbox>,
"setStyleRule"
"setHeight"
)}
<div className="pl25 shortStyle">
{helper(
@ -145,7 +145,7 @@ export default Form.create()(
</Radio.Group>,
""
)}
<div className="pl25 pt5 pb5 mb15">
<div className="pl25 mb15">
{helper(
"",
"push_whitelist_usernames",
@ -172,7 +172,7 @@ export default Form.create()(
<Checkbox disabled={!protect} checked={mergeOptions} onChange={changeMergeOption}>
启用合并白名单<span className="color-grey-9 ml5 font-12">仅允许白名单用户或团队合并合并请求到此分支</span>
</Checkbox>,
"setStyleRule"
"setHeight"
)}
<div className="pl25 pt5 pb5">
{helper(
@ -201,9 +201,9 @@ export default Form.create()(
<Checkbox disabled={!protect}>
启用状态检查
</Checkbox>,
"setStyleRule",false,true
"setHeight",false,true
)}
<div style={{display:"flex",alignItems:"center"}}>
<div style={{display:"flex",alignItems:"center",padding:"10px 0px"}}>
{helper(
"所需的批准数",
"required_approvals",
@ -221,9 +221,9 @@ export default Form.create()(
<Checkbox name="enable_approvals_whitelist" disabled={!protect} checked={approveOptions} onChange={changeWhitelistUsernameOption}>
批准仅限列入白名单的用户或团队<span className="color-grey-9 ml5 font-12">只有白名单用户或团队的审核才能计数 没有批准的白名单,任何有写访问权限的人的审核都将计数</span>
</Checkbox>,
"setStyleRule"
"setHeight mb5"
)}
<div className="pl25 pt5 pb5 mb15">
<div className="pl25 mb15">
{helper(
"",
"approvals_whitelist_usernames",
@ -251,7 +251,7 @@ export default Form.create()(
<Checkbox disabled={!protect} name="block_on_rejected_reviews">
拒绝审核阻止了合并<span className="color-grey-9 ml5 font-12">如果官方审查人员要求作出改动，即使有足够的批准，合并也不允许</span>
</Checkbox>,
"setStyleRule",false,true
"setHeight mb5",false,true
)}
{helper(
@ -261,7 +261,7 @@ export default Form.create()(
<Checkbox disabled={!protect} name="dismiss_stale_approvals">
取消过时的批准<span className="color-grey-9 ml5 font-12">当新的提交更改合并请求内容被推送到分支时，旧的批准将被撤销</span>
</Checkbox>,
"setStyleRule",false,true
"setHeight mb5",false,true
)}
{helper(
"",
@ -270,7 +270,7 @@ export default Form.create()(
<Checkbox disabled={!protect} name="require_signed_commits">
需要签名提交
</Checkbox>,
"setStyleRule",false,true
"setHeight mb5",false,true
)}
{helper(
"",
@ -279,7 +279,7 @@ export default Form.create()(
<Checkbox disabled={!protect} name="block_on_outdated_branch">
如果拉取请求已经过时，阻止合并<span className="color-grey-9 ml5 font-12">当头部分支落后基础分支时，不能合并</span>
</Checkbox>,
"setStyleRule",false,true
"setHeight",false,true
)}
</div>

2
src/forge/Settings/CollaboratorMember.jsx
View File

@ -236,7 +236,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
<div className="baseForm" style={{display:'flex',justifyContent:"space-between",alignItems:"center"}}>
<Dropdown overlay={roles} placement={"bottomCenter"}>
<a className="text-primary">
{roleName ? roleName : "角色筛选"}
{roleName || "角色筛选"}
<Icon type="caret-down" size="16"></Icon>
</a>
</Dropdown>