diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
commit | 903ccf7c93eb9490c76857bffe744249cc07de09 (patch) | |
tree | 603a3162e91999160e4efc74f351f9405f422d61 /app/views/projects/prometheus | |
parent | 41cb558299b483b44b45351730ee4c0e9fe4ca2c (diff) | |
download | gitlab-ce-903ccf7c93eb9490c76857bffe744249cc07de09.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/prometheus')
-rw-r--r-- | app/views/projects/prometheus/metrics/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/prometheus/metrics/edit.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/prometheus/metrics/new.html.haml | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/views/projects/prometheus/metrics/_form.html.haml b/app/views/projects/prometheus/metrics/_form.html.haml new file mode 100644 index 00000000000..a87d81e6325 --- /dev/null +++ b/app/views/projects/prometheus/metrics/_form.html.haml @@ -0,0 +1,4 @@ +- project = local_assigns.fetch(:project) +- metric = local_assigns.fetch(:metric) + +#js-custom-metrics{ data: custom_metrics_data(project, metric) } diff --git a/app/views/projects/prometheus/metrics/edit.html.haml b/app/views/projects/prometheus/metrics/edit.html.haml new file mode 100644 index 00000000000..15a9c922ca6 --- /dev/null +++ b/app/views/projects/prometheus/metrics/edit.html.haml @@ -0,0 +1,6 @@ +- add_to_breadcrumbs _("Settings"), edit_project_path(@project) +- add_to_breadcrumbs _("Integrations"), project_settings_integrations_path(@project) +- add_to_breadcrumbs "Prometheus", edit_project_service_path(@project, PrometheusService) +- breadcrumb_title s_('Metrics|Edit metric') +- page_title @metric.title, s_('Metrics|Edit metric') += render 'form', project: @project, metric: @metric diff --git a/app/views/projects/prometheus/metrics/new.html.haml b/app/views/projects/prometheus/metrics/new.html.haml new file mode 100644 index 00000000000..fa925d090cb --- /dev/null +++ b/app/views/projects/prometheus/metrics/new.html.haml @@ -0,0 +1,6 @@ +- add_to_breadcrumbs _("Settings"), edit_project_path(@project) +- add_to_breadcrumbs _("Integrations"), project_settings_integrations_path(@project) +- add_to_breadcrumbs "Prometheus", edit_project_service_path(@project, PrometheusService) +- breadcrumb_title s_('Metrics|New metric') +- page_title s_('Metrics|New metric') += render 'form', project: @project, metric: @metric |