diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 21:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 21:09:27 +0300 |
| commit | 5248c5e2212b8e42b28b23e6839d69db0006829b (patch) | |
| tree | f989d4b4cd06fc5dc28c024a5f230b42b0af179b /app/assets/javascripts/vue_shared | |
| parent | 0d55697d64b5f053bbd0f69da2962e7478097de3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/web_ide_link.vue | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue index 5fed66f88fa..6803d609dbc 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue @@ -369,10 +369,10 @@ export default { <alert-details-table :alert="alert" :loading="loading" :statuses="statuses" /> </gl-tab> - <metric-images-tab - :data-testid="$options.tabsConfig[1].id" - :title="$options.tabsConfig[1].title" - /> + <gl-tab :title="$options.tabsConfig[1].title"> + <metric-images-tab :data-testid="$options.tabsConfig[1].id" /> + </gl-tab> + <gl-tab :data-testid="$options.tabsConfig[2].id" :title="$options.tabsConfig[2].title"> <div v-if="alert.notes.nodes.length > 0" class="issuable-discussion"> <ul class="notes main-notes-list timeline"> diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue index 74f14dbd5c9..9288cf7a733 100644 --- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue +++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue @@ -337,6 +337,11 @@ export default { this.select(KEY_WEB_IDE); }, + dismissCalloutOnActionClicked(dismiss) { + if (this.displayVscodeWebIdeCallout) { + dismiss(); + } + }, }, webIdeButtonId: 'web-ide-link', PREFERRED_EDITOR_KEY, @@ -355,7 +360,7 @@ export default { :category="isBlob ? 'primary' : 'secondary'" :show-action-tooltip="!displayVscodeWebIdeCallout || !shouldShowCallout" @select="select" - @actionClicked="dismiss" + @actionClicked="dismissCalloutOnActionClicked(dismiss)" /> <local-storage-sync :storage-key="$options.PREFERRED_EDITOR_KEY" |