summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-05-30 09:02:51 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-05-30 09:02:51 +0000
commit38319ae7dda547062a671e4bcd2177d6dd96075e (patch)
treeb2bac35e7d5cbe4e6d22d2e96435d9c1468c63e0 /app/assets
parent0e2336442636cdb7f5082b652ff5332d78855e9a (diff)
parent2cf3fbcfb4a19169713382e3e27e43b9dfce6baa (diff)
downloadgitlab-ce-38319ae7dda547062a671e4bcd2177d6dd96075e.tar.gz
Merge branch 'vue-repo-parent-row-fixes' into 'master'
Fixes bug with parent row component triggering multiple Vue router pushes See merge request gitlab-org/gitlab-ce!28882
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/repository/components/table/parent_row.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/repository/components/table/parent_row.vue b/app/assets/javascripts/repository/components/table/parent_row.vue
index b4433f00d8a..3c39f404226 100644
--- a/app/assets/javascripts/repository/components/table/parent_row.vue
+++ b/app/assets/javascripts/repository/components/table/parent_row.vue
@@ -27,8 +27,8 @@ export default {
</script>
<template>
- <tr v-once @click="clickRow">
- <td colspan="3" class="tree-item-file-name">
+ <tr class="tree-item">
+ <td colspan="3" class="tree-item-file-name" @click.self="clickRow">
<router-link :to="parentRoute" :aria-label="__('Go to parent')">
..
</router-link>