diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 21:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 21:09:53 +0300 |
| commit | 5edd0d173ff0bc377348bf3585fa309eee783e32 (patch) | |
| tree | d71d995f018e56453e438f7b670c6597e45b4dd6 /app/assets/javascripts/alerts_settings | |
| parent | 61d62a296064e0330cffec7ed4b7914371b4984b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alerts_settings')
| -rw-r--r-- | app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue index 56ecf0d9c55..3c1ffde41c8 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue @@ -512,9 +512,14 @@ export default { /> </template> </gl-form-input-group> - <gl-button v-gl-modal.authKeyModal :disabled="!selectedService.active" class="gl-mt-3">{{ - $options.i18n.resetKey - }}</gl-button> + <div class="gl-display-flex gl-justify-content-end"> + <gl-button + v-gl-modal.authKeyModal + :disabled="!selectedService.active" + class="gl-mt-3" + >{{ $options.i18n.resetKey }}</gl-button + > + </div> <gl-modal modal-id="authKeyModal" :title="$options.i18n.resetKey" @@ -541,11 +546,16 @@ export default { max-rows="10" /> </gl-form-group> - <gl-button :disabled="!canTestAlert" @click="validateTestAlert">{{ - $options.i18n.testAlertInfo - }}</gl-button> + <div class="gl-display-flex gl-justify-content-end"> + <gl-button :disabled="!canTestAlert" @click="validateTestAlert">{{ + $options.i18n.testAlertInfo + }}</gl-button> + </div> </template> <div class="footer-block row-content-block gl-display-flex gl-justify-content-space-between"> + <gl-button category="primary" :disabled="!canSaveConfig" @click="onReset"> + {{ __('Cancel') }} + </gl-button> <gl-button variant="success" category="primary" @@ -554,9 +564,6 @@ export default { > {{ __('Save changes') }} </gl-button> - <gl-button variant="default" category="primary" :disabled="!canSaveConfig" @click="onReset"> - {{ __('Cancel') }} - </gl-button> </div> </gl-form> </div> |