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:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-08 22:34:02 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-05-08 22:35:28 +0300
commit780203dd7337d74e2ac651cdbb012c1c5d8c5375 (patch)
tree998b8c53271c3d993722dd496609227a271189f3 /app/assets
parent84f0e1c98f2187a3f4f296ea76be8dc40e2854f0 (diff)
Fix bad merge from master
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/deploy_keys/components/action_btn.vue4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue
index bdb0cc4efb7..42ab0b67d11 100644
--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@@ -11,6 +11,10 @@ export default {
type: Object,
required: true,
},
+ type: {
+ type: String,
+ required: true,
+ },
btnCssClass: {
type: String,
required: false,