diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 15:09:00 +0300 |
| commit | ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d (patch) | |
| tree | c53ad0fcdab26725814f1dc5267f6a04ebe4cf73 /app/assets/javascripts/self_monitor | |
| parent | 38149afcf95e7669a7a99828c579d185b70c04dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/self_monitor')
| -rw-r--r-- | app/assets/javascripts/self_monitor/components/self_monitor_form.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/self_monitor/store/state.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue index 6b19a72317c..1e203d332db 100644 --- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue +++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue @@ -129,7 +129,7 @@ export default { </div> <div class="settings-content"> <form name="self-monitoring-form"> - <p v-html="selfMonitoringFormText"></p> + <p ref="selfMonitoringFormText" v-html="selfMonitoringFormText"></p> <gl-form-group :label="$options.formLabels.createProject" label-for="self-monitor-toggle"> <gl-toggle v-model="selfMonitorEnabled" diff --git a/app/assets/javascripts/self_monitor/store/state.js b/app/assets/javascripts/self_monitor/store/state.js index a0ce88ff58c..582ce5576f1 100644 --- a/app/assets/javascripts/self_monitor/store/state.js +++ b/app/assets/javascripts/self_monitor/store/state.js @@ -9,7 +9,7 @@ export default (initialState = {}) => ({ deleteProjectStatusEndpoint: initialState.statusDeleteSelfMonitoringProjectPath || '', selfMonitorProjectPath: initialState.selfMonitoringProjectFullPath || '', showAlert: false, - projectPath: '', + projectPath: initialState.selfMonitoringProjectFullPath || '', loading: false, alertContent: {}, }); |