Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
d36aa82340
commit
82a708b9f0
|
@ -1,5 +1,5 @@
|
|||
<script>
|
||||
import _ from 'underscore';
|
||||
import { escape, debounce } from 'lodash';
|
||||
import { mapActions, mapState } from 'vuex';
|
||||
import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui';
|
||||
import createFlash from '~/flash';
|
||||
|
@ -54,7 +54,7 @@ export default {
|
|||
s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'),
|
||||
{
|
||||
docsLinkEnd: '</a>',
|
||||
docsLinkStart: `<a href="${_.escape(this.docsUrl)}">`,
|
||||
docsLinkStart: `<a href="${escape(this.docsUrl)}">`,
|
||||
placeholders,
|
||||
},
|
||||
false,
|
||||
|
@ -118,7 +118,7 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
...mapActions(['addBadge', 'renderBadge', 'saveBadge', 'stopEditing', 'updateBadgeInForm']),
|
||||
debouncedPreview: _.debounce(function preview() {
|
||||
debouncedPreview: debounce(function preview() {
|
||||
this.renderBadge();
|
||||
}, badgePreviewDelayInMilliseconds),
|
||||
onCancel() {
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
import * as Sentry from '@sentry/browser';
|
||||
import * as types from './mutation_types';
|
||||
import axios from '~/lib/utils/axios_utils';
|
||||
import createFlash from '~/flash';
|
||||
|
@ -94,11 +95,14 @@ export const fetchDashboard = ({ state, dispatch }) => {
|
|||
return backOffRequest(() => axios.get(state.dashboardEndpoint, { params }))
|
||||
.then(resp => resp.data)
|
||||
.then(response => dispatch('receiveMetricsDashboardSuccess', { response, params }))
|
||||
.catch(e => {
|
||||
dispatch('receiveMetricsDashboardFailure', e);
|
||||
.catch(error => {
|
||||
Sentry.captureException(error);
|
||||
|
||||
dispatch('receiveMetricsDashboardFailure', error);
|
||||
|
||||
if (state.showErrorBanner) {
|
||||
if (e.response.data && e.response.data.message) {
|
||||
const { message } = e.response.data;
|
||||
if (error.response.data && error.response.data.message) {
|
||||
const { message } = error.response.data;
|
||||
createFlash(
|
||||
sprintf(
|
||||
s__('Metrics|There was an error while retrieving metrics. %{message}'),
|
||||
|
@ -152,6 +156,8 @@ export const fetchPrometheusMetric = ({ commit }, { metric, params }) => {
|
|||
commit(types.RECEIVE_METRIC_RESULT_SUCCESS, { metricId: metric.metric_id, result });
|
||||
})
|
||||
.catch(error => {
|
||||
Sentry.captureException(error);
|
||||
|
||||
commit(types.RECEIVE_METRIC_RESULT_FAILURE, { metricId: metric.metric_id, error });
|
||||
// Continue to throw error so the dashboard can notify using createFlash
|
||||
throw error;
|
||||
|
@ -197,7 +203,8 @@ export const fetchDeploymentsData = ({ state, dispatch }) => {
|
|||
|
||||
dispatch('receiveDeploymentsDataSuccess', response.deployments);
|
||||
})
|
||||
.catch(() => {
|
||||
.catch(error => {
|
||||
Sentry.captureException(error);
|
||||
dispatch('receiveDeploymentsDataFailure');
|
||||
createFlash(s__('Metrics|There was an error getting deployment information.'));
|
||||
});
|
||||
|
@ -225,7 +232,8 @@ export const fetchEnvironmentsData = ({ state, dispatch }) => {
|
|||
|
||||
dispatch('receiveEnvironmentsDataSuccess', environments);
|
||||
})
|
||||
.catch(() => {
|
||||
.catch(err => {
|
||||
Sentry.captureException(err);
|
||||
dispatch('receiveEnvironmentsDataFailure');
|
||||
createFlash(s__('Metrics|There was an error getting environments information.'));
|
||||
});
|
||||
|
@ -254,7 +262,10 @@ export const duplicateSystemDashboard = ({ state }, payload) => {
|
|||
.then(response => response.data)
|
||||
.then(data => data.dashboard)
|
||||
.catch(error => {
|
||||
Sentry.captureException(error);
|
||||
|
||||
const { response } = error;
|
||||
|
||||
if (response && response.data && response.data.error) {
|
||||
throw sprintf(s__('Metrics|There was an error creating the dashboard. %{error}'), {
|
||||
error: response.data.error,
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Replace underscore with lodash for ./app/assets/javascripts/badges
|
||||
merge_request: 24966
|
||||
author: Jacopo Beschi @jacopo-beschi
|
||||
type: changed
|
|
@ -35,12 +35,14 @@ module Gitlab
|
|||
|
||||
def log_create_failed(error)
|
||||
logger.error({
|
||||
exception: error.class.name,
|
||||
exception: {
|
||||
class: error.class.name,
|
||||
message: error.message
|
||||
},
|
||||
status_code: error.error_code,
|
||||
namespace: name,
|
||||
class_name: self.class.name,
|
||||
event: :failed_to_create_namespace,
|
||||
message: error.message
|
||||
event: :failed_to_create_namespace
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -13486,7 +13486,7 @@ msgstr ""
|
|||
msgid "PackageRegistry|You are about to delete version %{boldStart}%{version}%{boldEnd} of %{boldStart}%{name}%{boldEnd}. Are you sure?"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|You may also need to setup authentication using an auth token. %{linkStart}See the documentation%{linkEnd} to find out more."
|
||||
msgid "PackageRegistry|You may also need to setup authentication using an auth token. %{linkStart}See the documentation%{linkEnd} to find out more."
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|npm"
|
||||
|
|
|
@ -92,12 +92,14 @@ describe Gitlab::Kubernetes::Namespace do
|
|||
it 'logs the error' do
|
||||
expect(subject.send(:logger)).to receive(:error).with(
|
||||
hash_including(
|
||||
exception: 'Kubeclient::HttpError',
|
||||
exception: {
|
||||
class: 'Kubeclient::HttpError',
|
||||
message: 'system failure'
|
||||
},
|
||||
status_code: 500,
|
||||
namespace: 'a_namespace',
|
||||
class_name: 'Gitlab::Kubernetes::Namespace',
|
||||
event: :failed_to_create_namespace,
|
||||
message: 'system failure'
|
||||
event: :failed_to_create_namespace
|
||||
)
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue