diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 18:17:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 18:17:30 +0000 |
| commit | 0bf82aa5cb3b1ed826dd5c0d46331e17aa60d9e9 (patch) | |
| tree | ee5a760877cce0189cc8e765a912a06942f3e4de /app/views/projects | |
| parent | efbf661c4224d481c57d0346e26983a805e5ec93 (diff) | |
| download | gitlab-ce-0bf82aa5cb3b1ed826dd5c0d46331e17aa60d9e9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/integrations/_form.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/settings/operations/show.html.haml | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index ce56b160187..50c46402b53 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -4,7 +4,7 @@ - add_to_breadcrumbs "#{@runner.short_sha}", project_runner_path(@project, @runner) %h1.page-title.gl-font-size-h-display - = s_('Runners|Runner #%{runner_id}' % { runner_id: @runner.id }) + = s_('Runners|Runner #%{runner_id}') % { runner_id: @runner.id } = render 'shared/runners/runner_type_badge', runner: @runner = render 'shared/runners/runner_type_alert', runner: @runner diff --git a/app/views/projects/settings/integrations/_form.html.haml b/app/views/projects/settings/integrations/_form.html.haml index 97d90976f18..de5c63cc7fd 100644 --- a/app/views/projects/settings/integrations/_form.html.haml +++ b/app/views/projects/settings/integrations/_form.html.haml @@ -21,5 +21,6 @@ = render 'shared/integration_settings', integration: integration - if lookup_context.template_exists?('show', "shared/integrations/#{integration.to_param}", true) - %hr - = render "shared/integrations/#{integration.to_param}/show", integration: integration + - if !(integration.to_param == 'prometheus' && Feature.enabled?(:remove_monitor_metrics)) + %hr + = render "shared/integrations/#{integration.to_param}/show", integration: integration diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index 2aae408b88f..bfa637ee35e 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -1,9 +1,14 @@ - page_title _('Monitor Settings') - breadcrumb_title _('Monitor Settings') -= render 'projects/settings/operations/metrics_dashboard' +- if Feature.disabled?(:remove_monitor_metrics) + = render 'projects/settings/operations/metrics_dashboard' + = render 'projects/settings/operations/error_tracking' = render 'projects/settings/operations/alert_management' = render 'projects/settings/operations/incidents' -= render 'projects/settings/operations/grafana_integration' + +- if Feature.disabled?(:remove_monitor_metrics) + = render 'projects/settings/operations/grafana_integration' + = render_if_exists 'projects/settings/operations/status_page' |