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
Jérome Perrin
gitlab-ce
Commits
523f1f7c
Commit
523f1f7c
authored
Feb 16, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed prometheus_metrics webpack bundle tag
parent
c94f25e1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
app/assets/javascripts/pages/projects/services/edit/index.js
app/assets/javascripts/pages/projects/services/edit/index.js
+7
-0
app/assets/javascripts/prometheus_metrics/index.js
app/assets/javascripts/prometheus_metrics/index.js
+0
-6
app/views/projects/services/prometheus/_show.html.haml
app/views/projects/services/prometheus/_show.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/pages/projects/services/edit/index.js
View file @
523f1f7c
import
IntegrationSettingsForm
from
'
~/integrations/integration_settings_form
'
;
import
IntegrationSettingsForm
from
'
~/integrations/integration_settings_form
'
;
import
PrometheusMetrics
from
'
~/prometheus_metrics/prometheus_metrics
'
;
export
default
()
=>
{
export
default
()
=>
{
const
prometheusSettingsWrapper
=
document
.
querySelector
(
'
.js-prometheus-metrics-monitoring
'
);
const
integrationSettingsForm
=
new
IntegrationSettingsForm
(
'
.js-integration-settings-form
'
);
const
integrationSettingsForm
=
new
IntegrationSettingsForm
(
'
.js-integration-settings-form
'
);
integrationSettingsForm
.
init
();
integrationSettingsForm
.
init
();
if
(
prometheusSettingsWrapper
)
{
const
prometheusMetrics
=
new
PrometheusMetrics
(
'
.js-prometheus-metrics-monitoring
'
);
prometheusMetrics
.
loadActiveMetrics
();
}
};
};
app/assets/javascripts/prometheus_metrics/index.js
deleted
100644 → 0
View file @
c94f25e1
import
PrometheusMetrics
from
'
./prometheus_metrics
'
;
$
(()
=>
{
const
prometheusMetrics
=
new
PrometheusMetrics
(
'
.js-prometheus-metrics-monitoring
'
);
prometheusMetrics
.
loadActiveMetrics
();
});
app/views/projects/services/prometheus/_show.html.haml
View file @
523f1f7c
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'prometheus_metrics'
)
.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring.js-prometheus-metrics-monitoring
.row.prepend-top-default.append-bottom-default.prometheus-metrics-monitoring.js-prometheus-metrics-monitoring
.col-lg-3
.col-lg-3
%h4
.prepend-top-0
%h4
.prepend-top-0
...
...
config/webpack.config.js
View file @
523f1f7c
...
@@ -83,7 +83,6 @@ var config = {
...
@@ -83,7 +83,6 @@ var config = {
pipelines_times
:
'
./pipelines/pipelines_times.js
'
,
pipelines_times
:
'
./pipelines/pipelines_times.js
'
,
profile
:
'
./profile/profile_bundle.js
'
,
profile
:
'
./profile/profile_bundle.js
'
,
project_import_gl
:
'
./projects/project_import_gitlab_project.js
'
,
project_import_gl
:
'
./projects/project_import_gitlab_project.js
'
,
prometheus_metrics
:
'
./prometheus_metrics
'
,
protected_branches
:
'
./protected_branches
'
,
protected_branches
:
'
./protected_branches
'
,
protected_tags
:
'
./protected_tags
'
,
protected_tags
:
'
./protected_tags
'
,
registry_list
:
'
./registry/index.js
'
,
registry_list
:
'
./registry/index.js
'
,
...
...
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