pull

src/forge/Issues/Component/comments/list.jsx

@@ -200,7 +200,7 @@ function IssueCommentList(props){
                     </div>
                     {login && <div>
                       {/* 平台管理员/仓库管理员/发布评论者/回复评论者/issue创建者 */}
-                      {(admin || isManager || login === i.user.login || login === i.reply_user.login || user_id === author.id) && <Popconfirm
+                      {(admin || isManager || login === i.user.login || (i.reply_user && login === i.reply_user.login) || user_id === author.id) && <Popconfirm
                         placement="bottom"
                         title={"确定要删除当前回复吗?"}
                         okText="是"

src/forge/users/Index.scss

@@ -278,7 +278,7 @@ ul.ant-menu.menuStyle{
 .infosRightMenu{
   .ant-menu-item{
     padding:0px;
-    margin:0px 17px 0px 0px !important;
+    margin:0px 30px 0px 0px !important;
     font-size: 17px;
     height: 32px;
     line-height: 0px;

src/forge/users/Infos.js

@@ -397,11 +397,11 @@ class Infos extends Component {
                       </Menu.Item>
                     :""
                   }
-                  {
+                  {/* {
                     current_user && current_user.login && current_user.login === username ?
                     <Menu.Item key="4"><Link to={`/${user && user.login}/devops/CIService`}><i className="iconfont icon-gongzuoliu1"></i>DevOps引擎</Link></Menu.Item>
                     :""
-                  }
+                  } */}
                   <Menu.Item key="5">
                     <Link to={`/${user && user.login}/organizes`}>
                       <i className="iconfont icon-zuzhi"></i>参与组织
@@ -434,7 +434,7 @@ class Infos extends Component {
                       return <FanUser {...this.props} {...this.state} userType="fan_users" fetchUser={this.fetchUser}/>;
                     }}
                   ></Route>
-                  <Route
+                  {/* <Route
                     path="/:username/devops/CDService"
                     render={() => {
                       return <InfosDevOpsCD {...this.props} {...this.state} />;
@@ -445,7 +445,7 @@ class Infos extends Component {
                     render={() => {
                       return <InfosDevOps {...this.props} {...this.state} />;
                     }}
-                  ></Route>
+                  ></Route> */}
                   <Route
                     path="/:username/projects"    // /:project_type
                     render={() => {