frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store repo credentials per-user

Browse Source
This commit is contained in:
Nick O'Leary
2017-12-06 22:39:30 +00:00
parent f86d3a69d2
commit 304c597a2f
3 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
red/runtime/storage/localfilesystem/projects/index.js
View File

@@ -182,17 +182,17 @@ function getFile(user, project,filePath,sha) {
}
function push(user, project,remoteBranchName,setRemote) {
checkActiveProject(project);
return activeProject.push(remoteBranchName,setRemote);
return activeProject.push(user,remoteBranchName,setRemote);
}
function pull(user, project,remoteBranchName,setRemote) {
checkActiveProject(project);
return activeProject.pull(remoteBranchName,setRemote).then(function() {
return activeProject.pull(user,remoteBranchName,setRemote).then(function() {
return reloadActiveProject("pull");
});
}
function getStatus(user, project) {
checkActiveProject(project);
return activeProject.status();
return activeProject.status(user);
}
function resolveMerge(user, project,file,resolution) {
checkActiveProject(project);
@@ -206,7 +206,7 @@ function abortMerge(user, project) {
}
function getBranches(user, project,isRemote) {
checkActiveProject(project);
return activeProject.getBranches(isRemote);
return activeProject.getBranches(user, isRemote);
}
function setBranch(user, project,branchName,isCreate) {
checkActiveProject(project);