diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 06:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 06:07:52 +0000 |
| commit | ba836d98593d68d8d6c22c540e31c8031a786bd8 (patch) | |
| tree | 09e500506edc566b08ea006ce41aa411990b9236 /app | |
| parent | 796b00a98a82fcbe082c9343fd4efcccc77478dc (diff) | |
| download | gitlab-ce-ba836d98593d68d8d6c22c540e31c8031a786bd8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/actions.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/state.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue index beff95eb47b..3276d21a04e 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue @@ -36,7 +36,9 @@ export default { }, }, mounted() { - this.updateSelectedCommitAction(); + if (!this.commitAction) { + this.updateSelectedCommitAction(); + } }, methods: { ...mapCommitActions(['updateCommitAction']), diff --git a/app/assets/javascripts/ide/stores/modules/commit/state.js b/app/assets/javascripts/ide/stores/modules/commit/state.js index 259577e48e0..f49737485f2 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/state.js +++ b/app/assets/javascripts/ide/stores/modules/commit/state.js @@ -1,6 +1,6 @@ export default () => ({ commitMessage: '', - commitAction: '1', + commitAction: null, newBranchName: '', submitCommitLoading: false, shouldCreateMR: true, |