diff --git a/src/AppConfig.js b/src/AppConfig.js index fbc327da..24f06656 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -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) { diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 28ed7690..86ddc392 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -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{