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
28ec1471
Commit
28ec1471
authored
Jul 14, 2020
by
Vitali Tatarintev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add pagerduty_active to permitted params
parent
cec750cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lib/gitlab/tracking/incident_management.rb
lib/gitlab/tracking/incident_management.rb
+3
-0
spec/controllers/projects/settings/operations_controller_spec.rb
...ntrollers/projects/settings/operations_controller_spec.rb
+4
-1
No files found.
lib/gitlab/tracking/incident_management.rb
View file @
28ec1471
...
@@ -32,6 +32,9 @@ module Gitlab
...
@@ -32,6 +32,9 @@ module Gitlab
},
},
send_email:
{
send_email:
{
name:
'sending_emails'
name:
'sending_emails'
},
pagerduty_active:
{
name:
'pagerduty_webhook'
}
}
}.
with_indifferent_access
.
freeze
}.
with_indifferent_access
.
freeze
end
end
...
...
spec/controllers/projects/settings/operations_controller_spec.rb
View file @
28ec1471
...
@@ -151,7 +151,8 @@ RSpec.describe Projects::Settings::OperationsController do
...
@@ -151,7 +151,8 @@ RSpec.describe Projects::Settings::OperationsController do
incident_management_setting_attributes:
{
incident_management_setting_attributes:
{
create_issue:
'false'
,
create_issue:
'false'
,
send_email:
'false'
,
send_email:
'false'
,
issue_template_key:
'some-other-template'
issue_template_key:
'some-other-template'
,
pagerduty_active:
'true'
}
}
}
}
end
end
...
@@ -184,6 +185,8 @@ RSpec.describe Projects::Settings::OperationsController do
...
@@ -184,6 +185,8 @@ RSpec.describe Projects::Settings::OperationsController do
it_behaves_like
'a gitlab tracking event'
,
{
issue_template_key:
nil
},
'disabled_issue_template_on_alerts'
it_behaves_like
'a gitlab tracking event'
,
{
issue_template_key:
nil
},
'disabled_issue_template_on_alerts'
it_behaves_like
'a gitlab tracking event'
,
{
send_email:
'1'
},
'enabled_sending_emails'
it_behaves_like
'a gitlab tracking event'
,
{
send_email:
'1'
},
'enabled_sending_emails'
it_behaves_like
'a gitlab tracking event'
,
{
send_email:
'0'
},
'disabled_sending_emails'
it_behaves_like
'a gitlab tracking event'
,
{
send_email:
'0'
},
'disabled_sending_emails'
it_behaves_like
'a gitlab tracking event'
,
{
pagerduty_active:
'1'
},
'enabled_pagerduty_webhook'
it_behaves_like
'a gitlab tracking event'
,
{
pagerduty_active:
'0'
},
'disabled_pagerduty_webhook'
end
end
end
end
...
...
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