forked from Gitlink/forgeplus-react
change
This commit is contained in:
parent
f8cd1fa0fe
commit
2dfeaa8aaa
|
|
@ -1,5 +1,4 @@
|
|||
import React, { Component } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import { Button, Form, Menu, Input, Select, Tag, Checkbox } from "antd";
|
||||
import axios from "axios";
|
||||
|
||||
|
|
@ -122,8 +121,6 @@ class MergeForm extends Component {
|
|||
isSpin: false,
|
||||
});
|
||||
this.props.history.push(`/projects/${projectsId}/merge`);
|
||||
// const { getDetail } = this.props;
|
||||
// getDetail && getDetail();
|
||||
} else {
|
||||
this.setState({
|
||||
isSpin: false,
|
||||
|
|
@ -143,7 +140,7 @@ class MergeForm extends Component {
|
|||
...values,
|
||||
body: desc,
|
||||
head: pull,
|
||||
base: head,
|
||||
base: merge,
|
||||
})
|
||||
.then((result) => {
|
||||
if (result) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue