diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/alerts_settings | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/alerts_settings')
-rw-r--r-- | app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/alerts_settings/graphql.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue index a5f7b84446f..6b5aac57f1c 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue @@ -16,6 +16,7 @@ import { import * as Sentry from '@sentry/browser'; import { isEqual, isEmpty, omit } from 'lodash'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import { PROMO_URL } from 'jh_else_ce/lib/utils/url_utility'; import { integrationTypes, integrationSteps, @@ -129,6 +130,7 @@ export default { name: true, apiUrl: true, }, + pricingLink: `${PROMO_URL}/pricing`, }; }, computed: { @@ -436,7 +438,7 @@ export default { disabled="true" class="gl-display-inline-block gl-my-4" :message="$options.i18n.integrationFormSteps.selectType.enterprise" - link="https://about.gitlab.com/pricing" + :link="pricingLink" data-testid="multi-integrations-not-supported" /> </gl-form-group> diff --git a/app/assets/javascripts/alerts_settings/graphql.js b/app/assets/javascripts/alerts_settings/graphql.js index 15862f4034a..b64e2e3eefa 100644 --- a/app/assets/javascripts/alerts_settings/graphql.js +++ b/app/assets/javascripts/alerts_settings/graphql.js @@ -59,6 +59,5 @@ export default new VueApollo({ cacheConfig: { fragmentMatcher, }, - assumeImmutableResults: true, }), }); |