diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx
index 43e671817..24f5cdb4c 100644
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@@ -6,7 +6,8 @@ import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom';
import { Pagination } from 'antd';
-function Commits({ commits , projectsId , owner , total ,limit , changeCommitFunc }){
+function Commits(props){
+ const { commits , projectsId , owner , total ,limit , changeCommitFunc, pullOwnerLogin } = props;
return(
{
@@ -17,10 +18,10 @@ function Commits({ commits , projectsId , owner , total ,limit , changeCommitFun
- {truncateCommitId(`${item.sha}`)}
+ {truncateCommitId(`${item.sha}`)}
{item.message}
- 浏览代码
+ 浏览代码
:提交于{item.time_from_now}
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index e974f5360..4ed3570d4 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -386,6 +386,8 @@ class CreateMerge extends Component {
} = this.state;
let { project } = this.props;
+ // 源仓库所有者login
+ const pullOwnerLogin = projects_names && projects_names.filter(item=>{return item.id === id})[0].project_user_login;
return (
@@ -481,6 +483,7 @@ class CreateMerge extends Component {
limit = {limit}
changeCommitFunc={this.changeCommitFunc}
comparesData={comparesData}
+ pullOwnerLogin={pullOwnerLogin}
>
)}
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index 16cc95632..ea8b6b7eb 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -33,7 +33,7 @@
word-break: break-all;
}
.see-file{
- width: 14rem;
+ width: 15rem;
.ml10{
display: inline-block;
width: 4.5rem;
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index d577bc57a..0d39f74cf 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -592,6 +592,7 @@ class MessageCount extends Component {
{...this.props}
{...this.state}
bindFootRef={this.bindFootRef}
+ pullOwnerLogin={data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.author_login}
>
) : (