Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c1a5e5d8
Commit
c1a5e5d8
authored
Aug 05, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9132222f
f3e2d048
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
app/assets/javascripts/notes/stores/utils.js
app/assets/javascripts/notes/stores/utils.js
+1
-1
app/assets/javascripts/operation_settings/components/external_dashboard.vue
...ipts/operation_settings/components/external_dashboard.vue
+2
-0
app/assets/javascripts/right_sidebar.js
app/assets/javascripts/right_sidebar.js
+6
-4
changelogs/unreleased/64675-Dashboard-URL-legend-border.yml
changelogs/unreleased/64675-Dashboard-URL-legend-border.yml
+5
-0
No files found.
app/assets/javascripts/notes/stores/utils.js
View file @
c1a5e5d8
...
...
@@ -21,7 +21,7 @@ export const getQuickActionText = note => {
text
=
__
(
'
Applying multiple commands
'
);
}
else
{
const
commandDescription
=
executedCommands
[
0
].
description
.
toLowerCase
();
text
=
sprintf
(
__
(
'
Applying command to %{commandDescription}
'
,
{
commandDescription
})
);
text
=
sprintf
(
__
(
'
Applying command to %{commandDescription}
'
),
{
commandDescription
}
);
}
}
...
...
app/assets/javascripts/operation_settings/components/external_dashboard.vue
View file @
c1a5e5d8
...
...
@@ -50,9 +50,11 @@ export default {
<form>
<gl-form-group
: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')"
>
<gl-form-input
id=
"full-dashboard-url"
v-model=
"userDashboardUrl"
placeholder=
"https://my-org.gitlab.io/my-dashboards"
@
keydown.enter.native.prevent=
"updateExternalDashboardUrl"
...
...
app/assets/javascripts/right_sidebar.js
View file @
c1a5e5d8
...
...
@@ -101,10 +101,12 @@ Sidebar.prototype.toggleTodo = function(e) {
this
.
todoUpdateDone
(
data
);
})
.
catch
(()
=>
flash
(
sprintf
(
__
(
'
There was an error %{message} todo.
'
)),
{
message
:
ajaxType
===
'
post
'
?
s__
(
'
RightSidebar|adding a
'
)
:
s__
(
'
RightSidebar|deleting the
'
),
}),
flash
(
sprintf
(
__
(
'
There was an error %{message} todo.
'
),
{
message
:
ajaxType
===
'
post
'
?
s__
(
'
RightSidebar|adding a
'
)
:
s__
(
'
RightSidebar|deleting the
'
),
}),
),
);
};
...
...
changelogs/unreleased/64675-Dashboard-URL-legend-border.yml
0 → 100644
View file @
c1a5e5d8
---
title
:
Removed extrenal dashboard legend border
merge_request
:
31407
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment