-
- {truncateCommitId(`${item.sha}`)}
- {item.message}
-
+
+ {truncateCommitId(`${item.sha}`)}
+ {item.message}
+
{
item.id ?
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index e87fd037..74aa512b 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -43,7 +43,7 @@ class MergeItem extends Component {
};
render() {
- const { issues, project_name, project_author_name } = this.props;
+ const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
const { projectsId , owner } = this.props.match.params;
const { current_user } = this.props;
const renderList = () => {
@@ -177,7 +177,7 @@ class MergeItem extends Component {
) : (
""
)}
- {current_user && current_user.login ? (
+ {user_admin_or_member ? (
)
}
- mergeabledDesc=(base,head)=>{
+ mergeabledDesc=(base,head,conflict_files)=>{
return(
-
- - git fetch origin
- - git checkout -b {`${base}`} origin/{`${base}`}
- - git merge {`${head}`}
-
+
+
+ - git fetch origin
+ - git checkout -b {`${base}`} origin/{`${base}`}
+ - git merge {`${head}`}
+
+ {
+ conflict_files && conflict_files.length>0 &&
+
+
如下文件有代码冲突：
+
+ {
+ conflict_files.map((i,k)=>{
+ return k>0 ? "，"+i : i
+ })
+ }
+
+
+ }
+
)
}
@@ -284,7 +301,8 @@ class MessageCount extends Component {
ismesrge,
SpinFlag,
copyVisible,
- pull_request
+ pull_request,
+ conflict_files
} = this.state;
const { current_user, projectDetail } = this.props;
const menu = (
@@ -495,7 +513,7 @@ class MessageCount extends Component {
}
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index bcee5d0d..c0c7e5ce 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -155,7 +155,7 @@ class merge extends Component {
renderMenu = (array, name, id) => {
return (
-
-
this.islogin()}>
- + 新建合并请求
-
+ {
+ data && data.user_admin_or_member &&
+
this.checkOperation()}>
+ + 新建合并请求
+
+ }
@@ -402,6 +400,7 @@ class merge extends Component {
project_author_name={data.project_author_name}
{...this.props}
{...this.state}
+ user_admin_or_member={data && data.user_admin_or_member}
>
):""}
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 277f5d4a..644a653d 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -249,7 +249,7 @@ class Detail extends Component {
添加于 {data && data.created_at}
{data && data.user_permission ? (
-
+
复制
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index e6e63991..d87bfe0b 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -153,7 +153,7 @@ class Milepost extends Component {
const { data, limit, page, openselect, closeselect, spinings } = this.state;
const { projectsId , owner } = this.props.match.params;
const menu = (
-