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
b6f6db43
Commit
b6f6db43
authored
Sep 04, 2020
by
Gilang Gumilar
Committed by
Simon Knox
Sep 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Migrate '.fa-spinner' to '.spinner' for 'app/views/projects/services/prometheus'"
parent
de6fba24
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/projects/services/prometheus/_custom_metrics.html.haml
...ws/projects/services/prometheus/_custom_metrics.html.haml
+1
-1
app/views/projects/services/prometheus/_metrics.html.haml
app/views/projects/services/prometheus/_metrics.html.haml
+1
-1
changelogs/unreleased/202607-migrate-spinner-for-app-views-projects-services-prometheus.yml
...te-spinner-for-app-views-projects-services-prometheus.yml
+5
-0
No files found.
app/views/projects/services/prometheus/_custom_metrics.html.haml
View file @
b6f6db43
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
.flash-text
.flash-text
.loading-metrics.js-loading-custom-metrics
.loading-metrics.js-loading-custom-metrics
%p
.m-3
%p
.m-3
=
icon
(
'spinner spin'
,
class:
'metrics-load-spinner'
)
=
loading_icon
(
css_
class:
'metrics-load-spinner'
)
=
s_
(
'PrometheusService|Finding custom metrics...'
)
=
s_
(
'PrometheusService|Finding custom metrics...'
)
.empty-metrics.hidden.js-empty-custom-metrics
.empty-metrics.hidden.js-empty-custom-metrics
%p
.text-tertiary.m-3.js-no-active-integration-text.hidden
%p
.text-tertiary.m-3.js-no-active-integration-text.hidden
...
...
app/views/projects/services/prometheus/_metrics.html.haml
View file @
b6f6db43
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
.card-body
.card-body
.loading-metrics.js-loading-metrics
.loading-metrics.js-loading-metrics
%p
.m-3
%p
.m-3
=
icon
(
'spinner spin'
,
class:
'metrics-load-spinner'
)
=
loading_icon
(
css_
class:
'metrics-load-spinner'
)
=
s_
(
'PrometheusService|Finding and configuring metrics...'
)
=
s_
(
'PrometheusService|Finding and configuring metrics...'
)
.empty-metrics.hidden.js-empty-metrics
.empty-metrics.hidden.js-empty-metrics
%p
.text-tertiary.m-3
%p
.text-tertiary.m-3
...
...
changelogs/unreleased/202607-migrate-spinner-for-app-views-projects-services-prometheus.yml
0 → 100644
View file @
b6f6db43
---
title
:
Migrate '.fa-spinner' to '.spinner' for 'app/views/projects/services/prometheus'
merge_request
:
41126
author
:
Gilang Gumilar
type
:
changed
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