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

合并请求-分支需转换

This commit is contained in:
caishi 2023-04-13 15:58:20 +08:00
parent d318546687
commit 3806a5dd8d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppConfig.js
View File

@ -25,7 +25,7 @@ if (isDev) {
}
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
window.location.search.indexOf('debug=s') !== -1 ? 'student' :
window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
}
window._debugType = debugType;
export function initAxiosInterceptors(props) {

4
src/forge/Merge/CreateMerge.js
View File

@ -151,8 +151,8 @@ class CreateMerge extends Component {
checkBranch=async(branchParams)=>{
const { mergeBranch , mergeOwner, projectId , pullBranch ,pullOwner} = branchParams;
let getbranch =await this.getBranchList(mergeOwner,projectId,pullBranch,mergeBranch,"merge");
let checkpull =await this.getBranchList(pullOwner,projectId,pullBranch,mergeBranch,"pull");
let getbranch =await this.getBranchList(mergeOwner,projectId,returnbar(pullBranch),returnbar(mergeBranch),"merge");
let checkpull =await this.getBranchList(pullOwner,projectId,returnbar(pullBranch),returnbar(mergeBranch),"pull");
if(getbranch && checkpull){
this.compareProject(mergeOwner === pullOwner, branchParams,1);
}else{