BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
edf0aafa
Commit
edf0aafa
authored
Dec 13, 2017
by
Tim Zallmann
Committed by
LUKE BENNETT
Dec 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into 'master'
Resolve "Prometheus loading screen no longer seems to appear" Closes #40285 See merge request gitlab-org/gitlab-ce!15889 (cherry picked from commit
a8b98528
)
d072c0cd
fix broken empty state assets for environment monitoring page
9864720a
add CHANGELOG.md entry for !15889
parent
81038fba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
metrics.html.haml
app/views/projects/environments/metrics.html.haml
+3
-3
40285-prometheus-loading-screen-no-longer-seems-to-appear.yml
...5-prometheus-loading-screen-no-longer-seems-to-appear.yml
+5
-0
No files found.
app/views/projects/environments/metrics.html.haml
View file @
edf0aafa
...
...
@@ -15,9 +15,9 @@
#prometheus-graphs
{
data:
{
"settings-path"
:
edit_project_service_path
(
@project
,
'prometheus'
),
"documentation-path"
:
help_page_path
(
'administration/monitoring/prometheus/index.md'
),
"empty-getting-started-svg-path"
:
image_path
(
'illustrations/monitoring/getting_started'
),
"empty-loading-svg-path"
:
image_path
(
'illustrations/monitoring/loading'
),
"empty-unable-to-connect-svg-path"
:
image_path
(
'illustrations/monitoring/unable_to_connect'
),
"empty-getting-started-svg-path"
:
image_path
(
'illustrations/monitoring/getting_started
.svg
'
),
"empty-loading-svg-path"
:
image_path
(
'illustrations/monitoring/loading
.svg
'
),
"empty-unable-to-connect-svg-path"
:
image_path
(
'illustrations/monitoring/unable_to_connect
.svg
'
),
"additional-metrics"
:
additional_metrics_project_environment_path
(
@project
,
@environment
,
format: :json
),
"project-path"
:
project_path
(
@project
),
"tags-path"
:
project_tags_path
(
@project
),
...
...
changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml
0 → 100644
View file @
edf0aafa
---
title
:
Fix broken illustration images for monitoring page empty states
merge_request
:
15889
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