Commit 85aad57c authored by Mike Greiling's avatar Mike Greiling Committed by GitLab Release Tools Bot

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 11c8b5a1)

f87517e0 Add Incidents section to Operations settings
a28742ad Add feature specs for settings page
parent 0797b945
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
} }
.settings { .settings {
border-bottom: 1px solid $gray-darker; // border-top for each item except the top one
+ .settings {
border-top: 1px solid $border-color;
}
&:first-of-type { &:first-of-type {
margin-top: 10px; margin-top: 10px;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- setting = error_tracking_setting - setting = error_tracking_setting
%section.settings.expanded.border-0.no-animate %section.settings.expanded.no-animate
.settings-header .settings-header
%h4 %h4
= _('Error Tracking') = _('Error Tracking')
......
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
- page_title _('Operations Settings') - page_title _('Operations Settings')
- breadcrumb_title _('Operations Settings') - breadcrumb_title _('Operations Settings')
= render_if_exists 'projects/settings/operations/incidents'
= render 'projects/settings/operations/error_tracking', expanded: true = render 'projects/settings/operations/error_tracking', expanded: true
= render_if_exists 'projects/settings/operations/tracing' = render_if_exists 'projects/settings/operations/tracing'
...@@ -18,6 +18,7 @@ describe 'projects/settings/operations/show' do ...@@ -18,6 +18,7 @@ describe 'projects/settings/operations/show' do
allow(view).to receive(:error_tracking_setting) allow(view).to receive(:error_tracking_setting)
.and_return(error_tracking_setting) .and_return(error_tracking_setting)
allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:incident_management_available?) { false }
end end
let!(:error_tracking_setting) do let!(:error_tracking_setting) do
......
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