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
9e5d60e3
Commit
9e5d60e3
authored
Jun 12, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
0f66d1ff
4c26b2f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+4
-10
changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
...dropdown-list-items-is-too-small-on-metrics-dashboard.yml
+5
-0
spec/javascripts/monitoring/dashboard_spec.js
spec/javascripts/monitoring/dashboard_spec.js
+1
-3
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
9e5d60e3
<
script
>
import
{
GlButton
,
GlDropdown
,
GlDropdownItem
,
GlModal
,
GlModalDirective
,
GlLink
,
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlDropdown
,
GlDropdownItem
,
GlModal
,
GlModalDirective
}
from
'
@gitlab/ui
'
;
import
_
from
'
underscore
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
s__
}
from
'
~/locale
'
;
...
...
@@ -31,7 +24,6 @@ export default {
GlButton
,
GlDropdown
,
GlDropdownItem
,
GlLink
,
GlModal
,
},
directives
:
{
...
...
@@ -255,7 +247,9 @@ export default {
v-for=
"(value, key) in timeWindows"
:key=
"key"
:active=
"activeTimeWindow(key)"
><gl-link
:href=
"setTimeWindowParameter(key)"
>
{{
value
}}
</gl-link></gl-dropdown-item
:href=
"setTimeWindowParameter(key)"
active-class=
"active"
>
{{
value
}}
</gl-dropdown-item
>
</gl-dropdown>
</div>
...
...
changelogs/unreleased/62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard.yml
0 → 100644
View file @
9e5d60e3
---
title
:
Enlarge metrics time-window dropdown links
merge_request
:
29458
author
:
type
:
fixed
spec/javascripts/monitoring/dashboard_spec.js
View file @
9e5d60e3
...
...
@@ -314,9 +314,7 @@ describe('Dashboard', () => {
});
setTimeout
(()
=>
{
const
selectedTimeWindow
=
component
.
$el
.
querySelector
(
'
.js-time-window-dropdown [active="true"]
'
,
);
const
selectedTimeWindow
=
component
.
$el
.
querySelector
(
'
.js-time-window-dropdown .active
'
);
expect
(
selectedTimeWindow
.
textContent
.
trim
()).
toEqual
(
'
30 minutes
'
);
done
();
...
...
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