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
a9ddd949
Commit
a9ddd949
authored
May 27, 2019
by
Adriel Santiago
Committed by
Kushal Pandya
May 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add expand/collapse button
Add ability to expand/collapse error tracking settings
parent
b6c12f80
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
2 deletions
+17
-2
app/assets/javascripts/error_tracking_settings/index.js
app/assets/javascripts/error_tracking_settings/index.js
+2
-0
app/views/projects/settings/operations/_error_tracking.html.haml
...ws/projects/settings/operations/_error_tracking.html.haml
+3
-1
app/views/projects/settings/operations/show.html.haml
app/views/projects/settings/operations/show.html.haml
+1
-1
changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml
...511-add-expand-collapse-to-project-operation-settings.yml
+5
-0
spec/features/projects/settings/operations_settings_spec.rb
spec/features/projects/settings/operations_settings_spec.rb
+6
-0
No files found.
app/assets/javascripts/error_tracking_settings/index.js
View file @
a9ddd949
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
ErrorTrackingSettings
from
'
./components/app.vue
'
;
import
ErrorTrackingSettings
from
'
./components/app.vue
'
;
import
createStore
from
'
./store
'
;
import
createStore
from
'
./store
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
export
default
()
=>
{
export
default
()
=>
{
initSettingsPanels
();
const
formContainerEl
=
document
.
querySelector
(
'
.js-error-tracking-form
'
);
const
formContainerEl
=
document
.
querySelector
(
'
.js-error-tracking-form
'
);
const
{
const
{
dataset
:
{
apiHost
,
enabled
,
project
,
token
,
listProjectsEndpoint
,
operationsSettingsEndpoint
},
dataset
:
{
apiHost
,
enabled
,
project
,
token
,
listProjectsEndpoint
,
operationsSettingsEndpoint
},
...
...
app/views/projects/settings/operations/_error_tracking.html.haml
View file @
a9ddd949
...
@@ -2,10 +2,12 @@
...
@@ -2,10 +2,12 @@
-
setting
=
error_tracking_setting
-
setting
=
error_tracking_setting
%section
.settings.
expanded.no-animate
%section
.settings.
no-animate.js-error-tracking-settings
.settings-header
.settings-header
%h4
%h4
=
_
(
'Error Tracking'
)
=
_
(
'Error Tracking'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
%p
%p
=
_
(
'To link Sentry to GitLab, enter your Sentry URL and Auth Token.'
)
=
_
(
'To link Sentry to GitLab, enter your Sentry URL and Auth Token.'
)
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/operations/error_tracking'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/operations/error_tracking'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
...
...
app/views/projects/settings/operations/show.html.haml
View file @
a9ddd949
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
-
breadcrumb_title
_
(
'Operations Settings'
)
-
breadcrumb_title
_
(
'Operations Settings'
)
=
render_if_exists
'projects/settings/operations/incidents'
=
render_if_exists
'projects/settings/operations/incidents'
=
render
'projects/settings/operations/error_tracking'
,
expanded:
true
=
render
'projects/settings/operations/error_tracking'
=
render
'projects/settings/operations/external_dashboard'
=
render
'projects/settings/operations/external_dashboard'
=
render_if_exists
'projects/settings/operations/tracing'
=
render_if_exists
'projects/settings/operations/tracing'
changelogs/unreleased/61511-add-expand-collapse-to-project-operation-settings.yml
0 → 100644
View file @
a9ddd949
---
title
:
Add expand/collapse to error tracking settings
merge_request
:
28619
author
:
type
:
added
spec/features/projects/settings/operations_settings_spec.rb
View file @
a9ddd949
...
@@ -46,6 +46,9 @@ describe 'Projects > Settings > For a forked project', :js do
...
@@ -46,6 +46,9 @@ describe 'Projects > Settings > For a forked project', :js do
wait_for_requests
wait_for_requests
within
'.js-error-tracking-settings'
do
click_button
(
'Expand'
)
end
expect
(
page
).
to
have_content
(
'Sentry API URL'
)
expect
(
page
).
to
have_content
(
'Sentry API URL'
)
expect
(
page
.
body
).
to
include
(
'Error Tracking'
)
expect
(
page
.
body
).
to
include
(
'Error Tracking'
)
expect
(
page
).
to
have_button
(
'Connect'
)
expect
(
page
).
to
have_button
(
'Connect'
)
...
@@ -86,6 +89,9 @@ describe 'Projects > Settings > For a forked project', :js do
...
@@ -86,6 +89,9 @@ describe 'Projects > Settings > For a forked project', :js do
wait_for_requests
wait_for_requests
within
'.js-error-tracking-settings'
do
click_button
(
'Expand'
)
end
check
(
'Active'
)
check
(
'Active'
)
fill_in
(
'error-tracking-api-host'
,
with:
'http://sentry.example.com'
)
fill_in
(
'error-tracking-api-host'
,
with:
'http://sentry.example.com'
)
fill_in
(
'error-tracking-token'
,
with:
'token'
)
fill_in
(
'error-tracking-token'
,
with:
'token'
)
...
...
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