diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 21:09:04 +0300 |
commit | 390582e118752426acf5cb25ec99103d312d891c (patch) | |
tree | bb0b1a6a46632024ffc3ba1983e4ebcb0fab4428 /app/assets | |
parent | 1ea1db491c8bc90789acda45c9002aaa5c4dc498 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
3 files changed, 30 insertions, 3 deletions
diff --git a/app/assets/javascripts/error_tracking/components/constants.js b/app/assets/javascripts/error_tracking/components/constants.js new file mode 100644 index 00000000000..7e3321c91bc --- /dev/null +++ b/app/assets/javascripts/error_tracking/components/constants.js @@ -0,0 +1,15 @@ +export const severityLevel = { + FATAL: 'fatal', + ERROR: 'error', + WARNING: 'warning', + INFO: 'info', + DEBUG: 'debug', +}; + +export const severityLevelVariant = { + [severityLevel.FATAL]: 'danger', + [severityLevel.ERROR]: 'dark', + [severityLevel.WARNING]: 'warning', + [severityLevel.INFO]: 'info', + [severityLevel.DEBUG]: 'light', +}; diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue index 819d501cba6..efc7e3c0809 100644 --- a/app/assets/javascripts/error_tracking/components/error_details.vue +++ b/app/assets/javascripts/error_tracking/components/error_details.vue @@ -11,6 +11,7 @@ import Stacktrace from './stacktrace.vue'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import timeagoMixin from '~/vue_shared/mixins/timeago'; import { trackClickErrorLinkToSentryOptions } from '../utils'; +import { severityLevel, severityLevelVariant } from './constants'; import query from '../queries/details.query.graphql'; @@ -147,6 +148,11 @@ export default { errorLevel() { return sprintf(__('level: %{level}'), { level: this.error.tags.level }); }, + errorSeverityVariant() { + return ( + severityLevelVariant[this.error.tags.level] || severityLevelVariant[severityLevel.ERROR] + ); + }, }, mounted() { this.startPollingDetails(this.issueDetailsPath); @@ -228,8 +234,12 @@ export default { <h2 class="text-truncate">{{ GQLerror.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 + v-if="error.tags.level" + :variant="errorSeverityVariant" + class="rounded-pill mr-2" + > + {{ errorLevel }} </gl-badge> <gl-badge v-if="error.tags.logger" variant="light" class="rounded-pill" >{{ error.tags.logger }} diff --git a/app/assets/javascripts/registry/settings/components/settings_form.vue b/app/assets/javascripts/registry/settings/components/settings_form.vue index b713cfe2e34..334fde23b74 100644 --- a/app/assets/javascripts/registry/settings/components/settings_form.vue +++ b/app/assets/javascripts/registry/settings/components/settings_form.vue @@ -174,7 +174,9 @@ export default { :label-cols="$options.labelsConfig.cols" :label-align="$options.labelsConfig.align" label-for="expiration-policy-name-matching" - :label="s__('ContainerRegistry|Expire Docker tags that match this regex:')" + :label=" + s__('ContainerRegistry|Docker tags with names matching this regex pattern will expire:') + " :state="nameRegexState" :invalid-feedback=" s__('ContainerRegistry|The value of this input should be less than 255 characters') |