diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 12:06:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 12:06:01 +0000 |
| commit | dea6ebd31af8e97e8b14160181bd4ea7578c94e8 (patch) | |
| tree | 5e429fda4d43aa3450f7d6b015668c3474cd9e6c /app/assets/javascripts/ide | |
| parent | 94611567bd03083e0ecef7a582a174aa34844482 (diff) | |
| download | gitlab-ce-dea6ebd31af8e97e8b14160181bd4ea7578c94e8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
| -rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/actions.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index 23caf2d48ed..f767ca92a56 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -152,6 +152,14 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo branch: getters.branchName, }) .then(() => { + commit(rootTypes.CLEAR_STAGED_CHANGES, null, { root: true }); + + commit(rootTypes.CLEAR_REPLACED_FILES, null, { root: true }); + + setTimeout(() => { + commit(rootTypes.SET_LAST_COMMIT_MSG, '', { root: true }); + }, 5000); + if (state.shouldCreateMR) { const { currentProject } = rootGetters; const targetBranch = getters.isCreatingNewBranch @@ -164,14 +172,6 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo { root: true }, ); } - - commit(rootTypes.CLEAR_STAGED_CHANGES, null, { root: true }); - - commit(rootTypes.CLEAR_REPLACED_FILES, null, { root: true }); - - setTimeout(() => { - commit(rootTypes.SET_LAST_COMMIT_MSG, '', { root: true }); - }, 5000); }) .then(() => { if (rootGetters.lastOpenedFile) { |