From c258498bd253e0dbb038d51f237cee1ebf0d0f56 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 27 May 2022 03:08:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/projects/project_visibility.js | 6 ++---- .../components/mr_widget_suggest_pipeline.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/projects/project_visibility.js b/app/assets/javascripts/projects/project_visibility.js index c962554c9f4..d299e106b14 100644 --- a/app/assets/javascripts/projects/project_visibility.js +++ b/app/assets/javascripts/projects/project_visibility.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import { escape } from 'lodash'; import { __, sprintf } from '~/locale'; import eventHub from '~/projects/new/event_hub'; @@ -63,9 +62,8 @@ export default function initProjectVisibilitySelector() { const namespaceSelector = document.querySelector('select.js-select-namespace'); if (namespaceSelector) { - $('.select2.js-select-namespace').on('change', () => - handleSelect2DropdownChange(namespaceSelector), - ); + const el = document.querySelector('.select2.js-select-namespace'); + el.addEventListener('change', () => handleSelect2DropdownChange(namespaceSelector)); handleSelect2DropdownChange(namespaceSelector); } } diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue index 8b410926c46..45958d7fb8d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue @@ -113,7 +113,7 @@ export default { data-testid="ok" category="primary" class="gl-mt-2" - variant="info" + variant="confirm" :href="pipelinePath" :data-track-property="humanAccess" :data-track-value="$options.SP_SHOW_TRACK_VALUE" -- cgit v1.2.3