Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
cc2ed858
Commit
cc2ed858
authored
Mar 14, 2019
by
Reuben Pereira
Committed by
Mike Greiling
Mar 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature specs for settings page
Add spec for form fields Style settings sections
parent
d3d24bb4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+4
-1
app/views/projects/settings/operations/_error_tracking.html.haml
...ws/projects/settings/operations/_error_tracking.html.haml
+1
-1
app/views/projects/settings/operations/show.html.haml
app/views/projects/settings/operations/show.html.haml
+1
-0
spec/views/projects/settings/operations/show.html.haml_spec.rb
...views/projects/settings/operations/show.html.haml_spec.rb
+1
-0
No files found.
app/assets/stylesheets/pages/settings.scss
View file @
cc2ed858
...
@@ -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
;
...
...
app/views/projects/settings/operations/_error_tracking.html.haml
View file @
cc2ed858
...
@@ -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'
)
...
...
app/views/projects/settings/operations/show.html.haml
View file @
cc2ed858
...
@@ -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'
spec/views/projects/settings/operations/show.html.haml_spec.rb
View file @
cc2ed858
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment