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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b6caf0b5
Commit
b6caf0b5
authored
Aug 13, 2019
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Collapse buttons to Operations settings
parent
21d364d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
ee/app/views/projects/settings/operations/_incidents.html.haml
...p/views/projects/settings/operations/_incidents.html.haml
+3
-1
ee/app/views/projects/settings/operations/_tracing.html.haml
ee/app/views/projects/settings/operations/_tracing.html.haml
+3
-1
ee/changelogs/unreleased/psimyn-operations-collapse-settings.yml
...gelogs/unreleased/psimyn-operations-collapse-settings.yml
+5
-0
No files found.
ee/app/views/projects/settings/operations/_incidents.html.haml
View file @
b6caf0b5
...
...
@@ -4,9 +4,11 @@
-
setting
=
project_incident_management_setting
-
templates
=
setting
.
available_issue_templates
.
map
{
|
t
|
[
t
.
name
,
t
.
key
]
}
%section
.settings.
expanded.
no-animate
%section
.settings.no-animate
.settings-header
%h4
=
_
(
'Incidents'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
%p
=
_
(
'Action to take when receiving an alert.'
)
=
link_to
help_page_path
(
'user/project/integrations/prometheus'
,
anchor:
'taking-action-on-an-alert-ultimate'
)
do
...
...
ee/app/views/projects/settings/operations/_tracing.html.haml
View file @
b6caf0b5
...
...
@@ -3,10 +3,12 @@
-
setting
=
tracing_setting
-
has_jaeger_url
=
setting
.
external_url
.
present?
%section
.settings.
expanded.
border-0.no-animate
%section
.settings.border-0.no-animate
.settings-header
{
:class
=>
"border-top"
}
%h4
=
_
(
"Jaeger tracing"
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
%p
-
if
has_jaeger_url
-
tracing_link
=
link_to
sanitize
(
@project
.
tracing_external_url
,
scrubber:
Rails
::
Html
::
TextOnlyScrubber
.
new
),
target:
"_blank"
,
rel:
'noopener noreferrer'
do
...
...
ee/changelogs/unreleased/psimyn-operations-collapse-settings.yml
0 → 100644
View file @
b6caf0b5
---
title
:
Add Collapse buttons to Operations settings
merge_request
:
15117
author
:
type
:
added
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