Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-08-12 03:10:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-12 03:10:38 +0300
commite57da6ba898df025f93bf8d3a896c7c2ba2ab830 (patch)
tree0eb1feedb28db1bbf9a695aae76b025a65105404 /app/assets/javascripts/alerts_settings
parent23790cda2b4145294d71591515acfe892d4c99a7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alerts_settings')
-rw-r--r--app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue1
-rw-r--r--app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue2
2 files changed, 1 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 033f48827f1..f831208d9f8 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
@@ -550,7 +550,6 @@ export default {
variant="confirm"
category="secondary"
class="gl-ml-3 js-no-auto-disable"
- data-testid="integration-form-test-and-submit"
data-qa-selector="save_and_create_alert_button"
@click="submit(true)"
>
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
index cc8913c2f45..bc9fe9543bd 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
@@ -396,7 +396,7 @@ export default {
/>
</gl-tab>
<gl-tab :title="$options.i18n.settingsTabs.integrationSettings">
- <alerts-form class="gl-pt-3" data-testid="alert-integration-settings-tab" />
+ <alerts-form class="gl-pt-3" />
</gl-tab>
</gl-tabs>
</template>