diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-11 18:08:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-11 18:08:34 +0300 |
| commit | c10eac33abd1b8ff5f296b200bec852e5714dac2 (patch) | |
| tree | e706ee930300cc7b92160c7eff11b6c0de094e3a /app/assets/javascripts/integrations | |
| parent | 8db5a837253227db3911940f0acca8f8ae5478b2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations')
| -rw-r--r-- | app/assets/javascripts/integrations/constants.js | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/integrations/edit/components/trigger_fields.vue | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app/assets/javascripts/integrations/constants.js b/app/assets/javascripts/integrations/constants.js index 1973a3c91ef..437bcc39886 100644 --- a/app/assets/javascripts/integrations/constants.js +++ b/app/assets/javascripts/integrations/constants.js @@ -83,3 +83,11 @@ export const billingPlanNames = { [billingPlans.PREMIUM]: s__('BillingPlans|Premium'), [billingPlans.ULTIMATE]: s__('BillingPlans|Ultimate'), }; + +const INTEGRATION_TYPE_SLACK = 'slack'; +const INTEGRATION_TYPE_MATTERMOST = 'mattermost'; + +export const placeholderForType = { + [INTEGRATION_TYPE_SLACK]: __('#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 92042a5c981..67647cadf19 100644 --- a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue @@ -1,17 +1,7 @@ <script> import { GlFormGroup, GlFormCheckbox, GlFormInput } from '@gitlab/ui'; import { mapGetters } from 'vuex'; -import { __ } from '~/locale'; - -const typeWithPlaceholder = { - SLACK: 'slack', - MATTERMOST: 'mattermost', -}; - -const placeholderForType = { - [typeWithPlaceholder.SLACK]: __('#general, #development'), - [typeWithPlaceholder.MATTERMOST]: __('my-channel'), -}; +import { placeholderForType } from 'jh_else_ce/integrations/constants'; export default { name: 'TriggerFields', |