diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-20 00:08:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-20 00:08:32 +0300 |
| commit | 60082b335c09b27ebee3452a36cc62eb76df3480 (patch) | |
| tree | 8a34e789590856679bca7955cda7fda06e257590 /app/assets/javascripts/integrations | |
| parent | ce493944f48fb2ad08a5381a7ed1f37ced637bd1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations')
| -rw-r--r-- | app/assets/javascripts/integrations/edit/components/dynamic_field.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue index 29318d6aaa8..29edd18cef2 100644 --- a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue +++ b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue @@ -135,8 +135,11 @@ export default { :label-for="fieldId" :invalid-feedback="__('This field is required.')" :state="valid" - :description="help" > + <template #description> + <span v-html="help"></span> + </template> + <template v-if="isCheckbox"> <input :name="fieldName" type="hidden" value="false" /> <gl-form-checkbox v-model="model" v-bind="sharedProps"> |