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>2019-12-25 09:08:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-25 09:08:01 +0300
commitd45691788ec45d0da3508c438ffdf43b08781f04 (patch)
tree83d443e8c6fc188cd0021889fed3466b58accf17 /app/assets/javascripts/error_tracking
parentac9d41902b722212197aa134f1b309004ebe6c42 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/error_tracking')
-rw-r--r--app/assets/javascripts/error_tracking/components/error_details.vue15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index 14b2e59009a..d4562d4a9a5 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -1,7 +1,7 @@
<script>
import { mapActions, mapGetters, mapState } from 'vuex';
import dateFormat from 'dateformat';
-import { GlFormInput, GlLink, GlLoadingIcon } from '@gitlab/ui';
+import { GlFormInput, GlLink, GlLoadingIcon, GlBadge } from '@gitlab/ui';
import { __, sprintf, n__ } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import Icon from '~/vue_shared/components/icon.vue';
@@ -20,6 +20,7 @@ export default {
TooltipOnTruncate,
Icon,
Stacktrace,
+ GlBadge,
},
directives: {
TrackEvent: TrackEventDirective,
@@ -94,6 +95,9 @@ export default {
false,
);
},
+ errorLevel() {
+ return sprintf(__('level: %{level}'), { level: this.error.tags.level });
+ },
},
mounted() {
this.startPollingDetails(this.issueDetailsPath);
@@ -144,6 +148,15 @@ export default {
<tooltip-on-truncate :title="error.title" truncate-target="child" placement="top">
<h2 class="text-truncate">{{ error.title }}</h2>
</tooltip-on-truncate>
+ <template v-if="error.tags">
+ <gl-badge v-if="error.tags.level" variant="danger" class="rounded-pill mr-2">{{
+ errorLevel
+ }}</gl-badge>
+ <gl-badge v-if="error.tags.logger" variant="light" class="rounded-pill">{{
+ error.tags.logger
+ }}</gl-badge>
+ </template>
+
<h3>{{ __('Error details') }}</h3>
<ul>
<li v-if="error.gitlab_issue">