diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-17 10:29:42 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-17 10:29:42 +0100 |
commit | 35d280450260bad53022b6022ece7d31b5f4bd1f (patch) | |
tree | 1a82a4ed9a5041bd35cdc1dacb4473b30fdbc98d /app/assets/javascripts/ide/stores/modules/commit/actions.js | |
parent | cb197ceb8031acb324510ce124a280caf2649442 (diff) | |
parent | a56611e3892b9039f6a8196c37d8b70a3c86c68b (diff) | |
download | gitlab-ce-35d280450260bad53022b6022ece7d31b5f4bd1f.tar.gz |
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'app/assets/javascripts/ide/stores/modules/commit/actions.js')
-rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/actions.js | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index 2565ede7193..b26512e213a 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -121,8 +121,6 @@ export const updateFilesAfterCommit = ( `/project/${rootState.currentProjectId}/blob/${branch}/${rootGetters.activeFile.path}`, ); } - - dispatch('updateCommitAction', consts.COMMIT_TO_CURRENT_BRANCH); }; export const commitChanges = ({ commit, state, getters, dispatch, rootState }) => { @@ -150,31 +148,31 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState }) = if (!data.short_id) { flash(data.message, 'alert', document, null, false, true); - return; + return null; } dispatch('setLastCommitMessage', data); + dispatch('updateCommitMessage', ''); + return dispatch('updateFilesAfterCommit', { + data, + branch: getters.branchName, + }) + .then(() => { + if (state.commitAction === consts.COMMIT_TO_NEW_BRANCH_MR) { + dispatch( + 'redirectToUrl', + createNewMergeRequestUrl( + rootState.projects[rootState.currentProjectId].web_url, + getters.branchName, + rootState.currentBranchId, + ), + { root: true }, + ); + } - if (state.commitAction === consts.COMMIT_TO_NEW_BRANCH_MR) { - dispatch( - 'redirectToUrl', - createNewMergeRequestUrl( - rootState.projects[rootState.currentProjectId].web_url, - getters.branchName, - rootState.currentBranchId, - ), - { root: true }, - ); - } else { - dispatch('updateFilesAfterCommit', { - data, - branch: getters.branchName, - }); - } - - commit(rootTypes.CLEAR_STAGED_CHANGES, null, { root: true }); - - dispatch('discardDraft'); + commit(rootTypes.CLEAR_STAGED_CHANGES, null, { root: true }); + }) + .then(() => dispatch('updateCommitAction', consts.COMMIT_TO_CURRENT_BRANCH)); }) .catch(err => { let errMsg = __('Error committing changes. Please try again.'); |