diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/assets/javascripts/error_tracking_settings | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/assets/javascripts/error_tracking_settings')
-rw-r--r-- | app/assets/javascripts/error_tracking_settings/components/app.vue | 32 | ||||
-rw-r--r-- | app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue | 2 |
2 files changed, 20 insertions, 14 deletions
diff --git a/app/assets/javascripts/error_tracking_settings/components/app.vue b/app/assets/javascripts/error_tracking_settings/components/app.vue index 971eb21ee3b..d188574e721 100644 --- a/app/assets/javascripts/error_tracking_settings/components/app.vue +++ b/app/assets/javascripts/error_tracking_settings/components/app.vue @@ -1,11 +1,17 @@ <script> -import { GlButton } from '@gitlab/ui'; +import { GlButton, GlFormGroup, GlFormCheckbox } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; import ErrorTrackingForm from './error_tracking_form.vue'; import ProjectDropdown from './project_dropdown.vue'; export default { - components: { ProjectDropdown, ErrorTrackingForm, GlButton }, + components: { + ErrorTrackingForm, + GlButton, + GlFormCheckbox, + GlFormGroup, + ProjectDropdown, + }, props: { initialApiHost: { type: String, @@ -66,18 +72,18 @@ export default { <template> <div> - <div class="form-check form-group"> - <input + <gl-form-group + :label="s__('ErrorTracking|Enable error tracking')" + label-for="error-tracking-enabled" + > + <gl-form-checkbox id="error-tracking-enabled" :checked="enabled" - class="form-check-input" - type="checkbox" - @change="updateEnabled($event.target.checked)" - /> - <label class="form-check-label" for="error-tracking-enabled">{{ - s__('ErrorTracking|Active') - }}</label> - </div> + @change="updateEnabled($event)" + > + {{ s__('ErrorTracking|Active') }} + </gl-form-checkbox> + </gl-form-group> <error-tracking-form /> <div class="form-group"> <project-dropdown @@ -95,7 +101,7 @@ export default { <gl-button :disabled="settingsLoading" class="js-error-tracking-button" - variant="success" + variant="confirm" @click="handleSubmit" > {{ __('Save changes') }} diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue index 4df324b396c..da942dbd0ae 100644 --- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue +++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue @@ -70,7 +70,7 @@ export default { v-show="connectSuccessful" class="js-error-tracking-connect-success gl-ml-2 text-success align-middle" :aria-label="__('Projects Successfully Retrieved')" - name="check-circle" + name="check" /> </div> </div> |