diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 09:08:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 09:08:24 +0000 |
commit | 728a207ea6a99a4bddc16dbbe82294d3fdb60fe4 (patch) | |
tree | 4bc3b6a859681de3bbeabd7bf2ec5ffd756f3a0a /app/assets/javascripts/error_tracking | |
parent | ea20020f71c7226d57b6449b1d9b6c6f1298223e (diff) | |
download | gitlab-ce-728a207ea6a99a4bddc16dbbe82294d3fdb60fe4.tar.gz |
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.vue | 25 | ||||
-rw-r--r-- | app/assets/javascripts/error_tracking/queries/details.query.graphql | 2 |
2 files changed, 17 insertions, 10 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue index 3d3447012db..51a1ae50467 100644 --- a/app/assets/javascripts/error_tracking/components/error_details.vue +++ b/app/assets/javascripts/error_tracking/components/error_details.vue @@ -235,18 +235,23 @@ export default { >{{ error.tags.logger }} </gl-badge> </template> - - <h3>{{ __('Error details') }}</h3> <ul> + <li v-if="GQLerror.gitlabCommit"> + <strong class="bold">{{ __('GitLab commit') }}:</strong> + <gl-link :href="GQLerror.gitlabCommitPath"> + <span>{{ GQLerror.gitlabCommit.substr(0, 10) }}</span> + </gl-link> + </li> <li v-if="error.gitlab_issue"> - <span class="bold">{{ __('GitLab Issue') }}:</span> + <strong class="bold">{{ __('GitLab Issue') }}:</strong> <gl-link :href="error.gitlab_issue"> <span>{{ error.gitlab_issue }}</span> </gl-link> </li> <li> - <span class="bold">{{ __('Sentry event') }}:</span> + <strong class="bold">{{ __('Sentry event') }}:</strong> <gl-link + class="d-inline-flex align-items-center" v-track-event="trackClickErrorLinkToSentryOptions(GQLerror.externalUrl)" :href="GQLerror.externalUrl" target="_blank" @@ -256,25 +261,25 @@ export default { </gl-link> </li> <li v-if="GQLerror.firstReleaseShortVersion"> - <span class="bold">{{ __('First seen') }}:</span> + <strong class="bold">{{ __('First seen') }}:</strong> {{ formatDate(GQLerror.firstSeen) }} <gl-link :href="firstReleaseLink" target="_blank"> - <span>{{ __('Release') }}: {{ GQLerror.firstReleaseShortVersion }}</span> + <span>{{ __('Release') }}: {{ GQLerror.firstReleaseShortVersion.substr(0, 10) }}</span> </gl-link> </li> <li v-if="GQLerror.lastReleaseShortVersion"> - <span class="bold">{{ __('Last seen') }}:</span> + <strong class="bold">{{ __('Last seen') }}:</strong> {{ formatDate(GQLerror.lastSeen) }} <gl-link :href="lastReleaseLink" target="_blank"> - <span>{{ __('Release') }}: {{ GQLerror.lastReleaseShortVersion }}</span> + <span>{{ __('Release') }}: {{ GQLerror.lastReleaseShortVersion.substr(0, 10) }}</span> </gl-link> </li> <li> - <span class="bold">{{ __('Events') }}:</span> + <strong class="bold">{{ __('Events') }}:</strong> <span>{{ GQLerror.count }}</span> </li> <li> - <span class="bold">{{ __('Users') }}:</span> + <strong class="bold">{{ __('Users') }}:</strong> <span>{{ GQLerror.userCount }}</span> </li> </ul> diff --git a/app/assets/javascripts/error_tracking/queries/details.query.graphql b/app/assets/javascripts/error_tracking/queries/details.query.graphql index f65bdb9b968..625ce3030d9 100644 --- a/app/assets/javascripts/error_tracking/queries/details.query.graphql +++ b/app/assets/javascripts/error_tracking/queries/details.query.graphql @@ -13,6 +13,8 @@ query errorDetails($fullPath: ID!, $errorId: ID!) { externalUrl firstReleaseShortVersion lastReleaseShortVersion + gitlabCommit + gitlabCommitPath } } } |