summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/app.vue
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2019-06-17 15:22:44 -0300
committerFelipe Artur <felipefac@gmail.com>2019-06-17 15:22:44 -0300
commitd9df2f730b4eaab4e2d1b5f5045e34bb14e3486f (patch)
tree050490a4e90601ad4d175ba6674b98f35937587e /app/assets/javascripts/diffs/components/app.vue
parent66b9ca952aa4104f99c1275566e8b5c7d28fce01 (diff)
parentd2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff)
downloadgitlab-ce-issue_60515.tar.gz
Merge branch 'master' into issue_60515issue_60515
Diffstat (limited to 'app/assets/javascripts/diffs/components/app.vue')
-rw-r--r--app/assets/javascripts/diffs/components/app.vue17
1 files changed, 16 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 11d6672cacf..81da0754752 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -69,6 +69,16 @@ export default {
required: false,
default: false,
},
+ dismissEndpoint: {
+ type: String,
+ required: false,
+ default: '',
+ },
+ showSuggestPopover: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
data() {
const treeWidth =
@@ -141,7 +151,12 @@ export default {
showTreeList: 'adjustView',
},
mounted() {
- this.setBaseConfig({ endpoint: this.endpoint, projectPath: this.projectPath });
+ this.setBaseConfig({
+ endpoint: this.endpoint,
+ projectPath: this.projectPath,
+ dismissEndpoint: this.dismissEndpoint,
+ showSuggestPopover: this.showSuggestPopover,
+ });
if (this.shouldShow) {
this.fetchData();