Commit 9ab13511 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'tr-separate-operations-settings-page' into 'master'

Update tracing settings to match error tracking

See merge request gitlab-org/gitlab-ee!8786
parents ea402fb0 93ae21f0
......@@ -3,7 +3,8 @@
- setting = tracing_setting
- has_jaeger_url = setting.external_url.present?
%section
%section.settings.expanded.border-0.no-animate
.settings-header{ :class => ("border-top" unless not Feature.enabled?(:error_tracking, @project)) }
%h4
= _("Jaeger tracing")
%p
......@@ -17,6 +18,7 @@
%span
= _('Tracing')
= _("To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server").html_safe % { link: tracing_link }
.settings-content
= form_for @project, url: project_settings_operations_path(@project), method: :patch do |f|
= form_errors(@project)
.form-group
......
---
title: Update tracing settings to match error tracking settings
merge_request: 8786
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment