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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e4d1f5d3
Commit
e4d1f5d3
authored
Apr 23, 2019
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Metrics environments dropdown
Also bring back EE dashboard component
parent
951ffd9d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+1
-0
app/assets/javascripts/monitoring/monitoring_bundle.js
app/assets/javascripts/monitoring/monitoring_bundle.js
+1
-1
changelogs/unreleased/60687-enviro-dropdown.yml
changelogs/unreleased/60687-enviro-dropdown.yml
+5
-0
spec/javascripts/monitoring/dashboard_spec.js
spec/javascripts/monitoring/dashboard_spec.js
+1
-1
No files found.
app/assets/javascripts/monitoring/components/dashboard.vue
View file @
e4d1f5d3
...
...
@@ -221,6 +221,7 @@ export default {
<gl-dropdown-item
v-for=
"environment in store.environmentsData"
:key=
"environment.id"
:href=
"environment.metrics_path"
:active=
"environment.name === currentEnvironmentName"
active-class=
"is-active"
>
{{
environment
.
name
}}
</gl-dropdown-item
...
...
app/assets/javascripts/monitoring/monitoring_bundle.js
View file @
e4d1f5d3
import
Vue
from
'
vue
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
Dashboard
from
'
.
/components/dashboard.vue
'
;
import
Dashboard
from
'
ee_else_ce/monitoring
/components/dashboard.vue
'
;
export
default
(
props
=
{})
=>
{
const
el
=
document
.
getElementById
(
'
prometheus-graphs
'
);
...
...
changelogs/unreleased/60687-enviro-dropdown.yml
0 → 100644
View file @
e4d1f5d3
---
title
:
Fix Metrics Environments dropdown
merge_request
:
author
:
type
:
fixed
spec/javascripts/monitoring/dashboard_spec.js
View file @
e4d1f5d3
...
...
@@ -175,7 +175,7 @@ describe('Dashboard', () => {
setTimeout
(()
=>
{
const
dropdownItems
=
component
.
$el
.
querySelectorAll
(
'
.js-environments-dropdown .dropdown-item
[active="true"]
'
,
'
.js-environments-dropdown .dropdown-item
.is-active
'
,
);
expect
(
dropdownItems
.
length
).
toEqual
(
1
);
...
...
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