diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-03-15 02:50:22 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 16:56:14 +0300 |
| commit | 85aad57c8b31c141e9c8c84671f66b3fb23230a4 (patch) | |
| tree | 305df22e1d5a125337d40f4952af8144b5423040 /app/views | |
| parent | 0797b9455bdc720a69264f93b3475bdbac76b63f (diff) | |
Merge branch 'psimyn-incident-report-section-ce' into 'master'
CE backport of Add Incidents section to Operations settings
See merge request gitlab-org/gitlab-ce!25939
(cherry picked from commit 11c8b5a18b6bfc822042d0748dcb6b04f11c1337)
f87517e0 Add Incidents section to Operations settings
a28742ad Add feature specs for settings page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/settings/operations/_error_tracking.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/operations/show.html.haml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/settings/operations/_error_tracking.html.haml b/app/views/projects/settings/operations/_error_tracking.html.haml index 6b15331db01..451a79becc3 100644 --- a/app/views/projects/settings/operations/_error_tracking.html.haml +++ b/app/views/projects/settings/operations/_error_tracking.html.haml @@ -2,7 +2,7 @@ - setting = error_tracking_setting -%section.settings.expanded.border-0.no-animate +%section.settings.expanded.no-animate .settings-header %h4 = _('Error Tracking') diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index 2822debe426..6f777305a54 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -2,5 +2,6 @@ - page_title _('Operations Settings') - breadcrumb_title _('Operations Settings') += render_if_exists 'projects/settings/operations/incidents' = render 'projects/settings/operations/error_tracking', expanded: true = render_if_exists 'projects/settings/operations/tracing' |