Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/javascripts/integrations/constants.js b/app/assets/javascripts/integrations/constants.js
index 2806b785816..392dd63b089 100644
--- a/app/assets/javascripts/integrations/constants.js
+++ b/app/assets/javascripts/integrations/constants.js
@@ -85,10 +85,12 @@ export const billingPlanNames = {
 };
 
 const INTEGRATION_TYPE_SLACK = 'slack';
+const INTEGRATION_TYPE_SLACK_APPLICATION = 'gitlab_slack_application';
 const INTEGRATION_TYPE_MATTERMOST = 'mattermost';
 
 export const placeholderForType = {
   [INTEGRATION_TYPE_SLACK]: __('#general, #development'),
+  [INTEGRATION_TYPE_SLACK_APPLICATION]: __('#general, #development'),
   [INTEGRATION_TYPE_MATTERMOST]: __('my-channel'),
 };
 
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>