summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue')
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue b/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
index 709d3592828..926034efd10 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue
@@ -1,9 +1,9 @@
<script>
-import { GlDropdown, GlDropdownForm, GlFormTextarea, GlButton } from '@gitlab/ui';
+import { GlDropdown, GlDropdownForm, GlFormTextarea, GlButton, GlAlert } from '@gitlab/ui';
import { __, n__ } from '~/locale';
export default {
- components: { GlDropdown, GlDropdownForm, GlFormTextarea, GlButton },
+ components: { GlDropdown, GlDropdownForm, GlFormTextarea, GlButton, GlAlert },
props: {
disabled: {
type: Boolean,
@@ -19,6 +19,11 @@ export default {
required: false,
default: 0,
},
+ errorMessage: {
+ type: String,
+ required: false,
+ default: null,
+ },
},
data() {
return {
@@ -55,6 +60,9 @@ export default {
>
<gl-dropdown-form class="gl-px-4! gl-m-0!">
<label for="commit-message">{{ __('Commit message') }}</label>
+ <gl-alert v-if="errorMessage" variant="danger" :dismissible="false" class="gl-mb-4">
+ {{ errorMessage }}
+ </gl-alert>
<gl-form-textarea
id="commit-message"
ref="commitMessage"