diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/assets/javascripts/integrations/edit/components/trigger_fields.vue | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
| download | gitlab-ce-7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/integrations/edit/components/trigger_fields.vue')
| -rw-r--r-- | app/assets/javascripts/integrations/edit/components/trigger_fields.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue index 67647cadf19..3820a87e5ad 100644 --- a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue @@ -23,7 +23,7 @@ export default { }, computed: { ...mapGetters(['isInheriting']), - placeholder() { + defaultPlaceholder() { return placeholderForType[this.type]; }, }, @@ -55,7 +55,7 @@ export default { v-if="event.field" v-model="event.field.value" :name="fieldName(event.field.name)" - :placeholder="placeholder" + :placeholder="event.field.placeholder || defaultPlaceholder" :readonly="isInheriting" /> </gl-form-group> |