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

Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge

This commit is contained in:
sylor_huang@126.com 2020-06-05 16:24:50 +08:00
parent 20e75b1606 cea1287773
commit cbe7775c81
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/forge/Merge/MergeItem.js
View File

@ -100,19 +100,18 @@ class MergeItem extends Component {
)}
</li>
<li>
<div className="flex-1">
<p>
{item.journals_count ? (
<Link
to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`}
>
<i className="iconfont icon-pinglun1 mr3 font-16"></i>
{item.journals_count}
</Link>
) : (
""
)}
</p>
<div className="flex1 df" style={{justifyContent:"center"}}>
{item.journals_count ? (
<Link
className="mr5"
to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`}
>
<i className="iconfont icon-pinglun1 mr3 font-16"></i>
{item.journals_count}
</Link>
) : (
""
)}
{current_user && current_user.login ? (
<div
className="milepostleft"