diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-03-14 23:50:22 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 13:56:14 +0000 |
| commit | 85aad57c8b31c141e9c8c84671f66b3fb23230a4 (patch) | |
| tree | 305df22e1d5a125337d40f4952af8144b5423040 | |
| parent | 0797b9455bdc720a69264f93b3475bdbac76b63f (diff) | |
| download | gitlab-ce-85aad57c8b31c141e9c8c84671f66b3fb23230a4.tar.gz | |
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
4 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 4f9d96da4bd..54126577f93 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -23,7 +23,10 @@ } .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 { margin-top: 10px; 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' diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb index 1bca8bba940..6762fe3759b 100644 --- a/spec/views/projects/settings/operations/show.html.haml_spec.rb +++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb @@ -18,6 +18,7 @@ describe 'projects/settings/operations/show' do allow(view).to receive(:error_tracking_setting) .and_return(error_tracking_setting) allow(view).to receive(:current_user).and_return(user) + allow(view).to receive(:incident_management_available?) { false } end let!(:error_tracking_setting) do |