summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 06:07:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 06:07:52 +0000
commitba836d98593d68d8d6c22c540e31c8031a786bd8 (patch)
tree09e500506edc566b08ea006ce41aa411990b9236 /app/assets/javascripts/ide/components
parent796b00a98a82fcbe082c9343fd4efcccc77478dc (diff)
downloadgitlab-ce-ba836d98593d68d8d6c22c540e31c8031a786bd8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/actions.vue4
1 files changed, 3 insertions, 1 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']),