Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-02 12:11:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-02 12:11:35 +0300
commited0d55ded7a03c8d5da501d3c86b38084f695cae (patch)
tree8612868b90f496a1dacc29c1a7a78cd7d380a26b /app/assets/javascripts/badges
parent951a32fcf3fc8766eae1430a389b77049410c371 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
-rw-r--r--app/assets/javascripts/badges/components/badge_form.vue5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue
index 7e605099655..5ff9dd8d0c6 100644
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@@ -1,5 +1,4 @@
<script>
-/* eslint-disable vue/no-v-html */
import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui';
import { escape, debounce } from 'lodash';
import { mapActions, mapState } from 'vuex';
@@ -184,7 +183,7 @@ export default {
<div class="form-group">
<label for="badge-link-url" class="label-bold">{{ s__('Badges|Link') }}</label>
- <p v-html="helpText"></p>
+ <p v-html="helpText /* eslint-disable-line vue/no-v-html */"></p>
<input
id="badge-link-url"
v-model="linkUrl"
@@ -199,7 +198,7 @@ export default {
<div class="form-group">
<label for="badge-image-url" class="label-bold">{{ s__('Badges|Badge image URL') }}</label>
- <p v-html="helpText"></p>
+ <p v-html="helpText /* eslint-disable-line vue/no-v-html */"></p>
<input
id="badge-image-url"
v-model="imageUrl"