Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-01 12:09:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-01 12:09:54 +0300
commit635d82b15d83a88a2d073fbf3bb56f6ff626020f (patch)
tree777ccf8764f948a44aba3bf792bde8717e950824 /app/assets/javascripts/admin
parenta7e81add72ecfbbf888ec4f73debdc2647b059de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
-rw-r--r--app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue6
-rw-r--r--app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue8
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue b/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue
index 2ea55d44420..bc2d96832fa 100644
--- a/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue
+++ b/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue
@@ -9,13 +9,13 @@ export default {
},
inject: {
svgPath: {
- type: String,
+ default: '',
},
docsLink: {
- type: String,
+ default: '',
},
primaryButtonPath: {
- type: String,
+ default: '',
},
},
};
diff --git a/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue b/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
index 5429ec403d3..316827e1b07 100644
--- a/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
+++ b/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
@@ -10,16 +10,16 @@ export default {
},
inject: {
isAdmin: {
- type: Boolean,
+ default: false,
},
svgPath: {
- type: String,
+ default: '',
},
docsLink: {
- type: String,
+ default: '',
},
primaryButtonPath: {
- type: String,
+ default: '',
},
},
};