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>2021-02-06 00:09:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-06 00:09:19 +0300
commit854956bd52cc724f53e3f37b7f9fb2b0aca82d61 (patch)
tree0799b30f851d1406aa2f9d9651ff2bcadf2303a9 /app/assets/javascripts/performance_bar
parenta83bc624e4d040e52a66633156e9120a45bbefe5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/performance_bar')
-rw-r--r--app/assets/javascripts/performance_bar/components/detailed_metric.vue19
1 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
index 6d896a97455..4a4cbbdaa70 100644
--- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue
+++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
@@ -1,5 +1,5 @@
<script>
-import { GlButton, GlIcon, GlModal, GlModalDirective } from '@gitlab/ui';
+import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui';
import RequestWarning from './request_warning.vue';
export default {
@@ -7,7 +7,6 @@ export default {
RequestWarning,
GlButton,
GlModal,
- GlIcon,
},
directives: {
'gl-modal': GlModalDirective,
@@ -97,7 +96,7 @@ export default {
<span class="gl-text-blue-300 gl-font-weight-bold">{{ metricDetailsLabel }}</span>
</gl-button>
<gl-modal :modal-id="modalId" :title="header" size="lg" footer-class="d-none" scrollable>
- <table class="table">
+ <table class="table gl-table">
<template v-if="detailsList.length">
<tr v-for="(item, index) in detailsList" :key="index">
<td>
@@ -110,20 +109,22 @@ export default {
<div
v-for="(key, keyIndex) in keys"
:key="key"
- class="break-word"
+ class="break-word gl-text-black-normal"
:class="{ 'mb-3 bold': keyIndex == 0 }"
>
{{ item[key] }}
<gl-button
v-if="keyIndex == 0 && item.backtrace"
- class="btn-sm gl-ml-3"
+ class="gl-ml-3 button-ellipsis-horizontal"
data-testid="backtrace-expand-btn"
- type="button"
+ category="primary"
+ variant="default"
+ icon="ellipsis_h"
+ size="small"
+ :selected="itemHasOpenedBacktrace(index)"
:aria-label="__('Toggle backtrace')"
@click="toggleBacktrace(index)"
- >
- <gl-icon :size="12" name="ellipsis_h" />
- </gl-button>
+ />
</div>
<pre v-if="itemHasOpenedBacktrace(index)" class="backtrace-row mt-2">{{
item.backtrace