diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-13 09:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-13 09:09:09 +0300 |
commit | 8f71e69fdbb65d2cf95cf16ef5a0add0919edb45 (patch) | |
tree | 0c282e1224b9ff50ba272b698b92919b72973af9 /app/assets/javascripts/incidents_settings | |
parent | f645d7e060e85cbf442b4e86009bc776688e4661 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents_settings')
-rw-r--r-- | app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/incidents_settings/index.js | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue b/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue index d6e963c6f4f..c90ff8079b8 100644 --- a/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue +++ b/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue @@ -11,6 +11,8 @@ export default { GlTab, AlertsSettingsForm, PagerDutySettingsForm, + ServiceLevelAgreementForm: () => + import('ee_component/incidents_settings/components/service_level_agreement_form.vue'), }, tabs: INTEGRATION_TABS_CONFIG, i18n: I18N_INTEGRATION_TABS, @@ -45,6 +47,7 @@ export default { > <component :is="tab.component" class="gl-pt-3" :data-testid="`${tab.component}-tab`" /> </gl-tab> + <service-level-agreement-form /> </gl-tabs> </div> </section> diff --git a/app/assets/javascripts/incidents_settings/index.js b/app/assets/javascripts/incidents_settings/index.js index ad875d49768..e9ba4294519 100644 --- a/app/assets/javascripts/incidents_settings/index.js +++ b/app/assets/javascripts/incidents_settings/index.js @@ -21,6 +21,9 @@ export default () => { pagerdutyWebhookUrl, pagerdutyResetKeyPath, autoCloseIncident, + slaActive, + slaMinutes, + slaFeatureAvailable, }, } = el; @@ -40,6 +43,11 @@ export default () => { active: parseBoolean(pagerdutyActive), webhookUrl: pagerdutyWebhookUrl, }, + serviceLevelAgreementSettings: { + active: parseBoolean(slaActive), + minutes: slaMinutes, + available: parseBoolean(slaFeatureAvailable), + }, }, render(createElement) { return createElement(SettingsTabs); |