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>2020-02-19 09:09:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 09:09:21 +0300
commit82a708b9f0adca259062555d16a9720f9955993b (patch)
tree4408754e03b69e4731e464b58118b23b89f5b0ac /app/assets/javascripts/badges
parentd36aa82340b8bdd23296de41b9c2a49765d92fcd (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.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue
index 19668d7e232..dccc0b024ba 100644
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@@ -1,5 +1,5 @@
<script>
-import _ from 'underscore';
+import { escape, debounce } from 'lodash';
import { mapActions, mapState } from 'vuex';
import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui';
import createFlash from '~/flash';
@@ -54,7 +54,7 @@ export default {
s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'),
{
docsLinkEnd: '</a>',
- docsLinkStart: `<a href="${_.escape(this.docsUrl)}">`,
+ docsLinkStart: `<a href="${escape(this.docsUrl)}">`,
placeholders,
},
false,
@@ -118,7 +118,7 @@ export default {
},
methods: {
...mapActions(['addBadge', 'renderBadge', 'saveBadge', 'stopEditing', 'updateBadgeInForm']),
- debouncedPreview: _.debounce(function preview() {
+ debouncedPreview: debounce(function preview() {
this.renderBadge();
}, badgePreviewDelayInMilliseconds),
onCancel() {