Commit c1a5e5d8 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 9132222f f3e2d048
...@@ -21,7 +21,7 @@ export const getQuickActionText = note => { ...@@ -21,7 +21,7 @@ export const getQuickActionText = note => {
text = __('Applying multiple commands'); text = __('Applying multiple commands');
} else { } else {
const commandDescription = executedCommands[0].description.toLowerCase(); const commandDescription = executedCommands[0].description.toLowerCase();
text = sprintf(__('Applying command to %{commandDescription}', { commandDescription })); text = sprintf(__('Applying command to %{commandDescription}'), { commandDescription });
} }
} }
......
...@@ -50,9 +50,11 @@ export default { ...@@ -50,9 +50,11 @@ export default {
<form> <form>
<gl-form-group <gl-form-group
:label="s__('ExternalMetrics|Full dashboard URL')" :label="s__('ExternalMetrics|Full dashboard URL')"
label-for="full-dashboard-url"
:description="s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')" :description="s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')"
> >
<gl-form-input <gl-form-input
id="full-dashboard-url"
v-model="userDashboardUrl" v-model="userDashboardUrl"
placeholder="https://my-org.gitlab.io/my-dashboards" placeholder="https://my-org.gitlab.io/my-dashboards"
@keydown.enter.native.prevent="updateExternalDashboardUrl" @keydown.enter.native.prevent="updateExternalDashboardUrl"
......
...@@ -101,10 +101,12 @@ Sidebar.prototype.toggleTodo = function(e) { ...@@ -101,10 +101,12 @@ Sidebar.prototype.toggleTodo = function(e) {
this.todoUpdateDone(data); this.todoUpdateDone(data);
}) })
.catch(() => .catch(() =>
flash(sprintf(__('There was an error %{message} todo.')), { flash(
message: sprintf(__('There was an error %{message} todo.'), {
ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'), message:
}), ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'),
}),
),
); );
}; };
......
---
title: Removed extrenal dashboard legend border
merge_request: 31407
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment