Commit c299e39f authored by Mike Greiling's avatar Mike Greiling

Merge branch...

Merge branch '196646-replace-underscore-with-lodash-for-app-assets-javascripts-badges' into 'master'

Resolve "Replace underscore with lodash for ./app/assets/javascripts/badges"

Closes #196646

See merge request gitlab-org/gitlab!24966
parents 4cbd0af6 1d588af2
<script> <script>
import _ from 'underscore'; import { escape, debounce } from 'lodash';
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui'; import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui';
import createFlash from '~/flash'; import createFlash from '~/flash';
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'), s__('Badges|The %{docsLinkStart}variables%{docsLinkEnd} GitLab supports: %{placeholders}'),
{ {
docsLinkEnd: '</a>', docsLinkEnd: '</a>',
docsLinkStart: `<a href="${_.escape(this.docsUrl)}">`, docsLinkStart: `<a href="${escape(this.docsUrl)}">`,
placeholders, placeholders,
}, },
false, false,
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
}, },
methods: { methods: {
...mapActions(['addBadge', 'renderBadge', 'saveBadge', 'stopEditing', 'updateBadgeInForm']), ...mapActions(['addBadge', 'renderBadge', 'saveBadge', 'stopEditing', 'updateBadgeInForm']),
debouncedPreview: _.debounce(function preview() { debouncedPreview: debounce(function preview() {
this.renderBadge(); this.renderBadge();
}, badgePreviewDelayInMilliseconds), }, badgePreviewDelayInMilliseconds),
onCancel() { onCancel() {
......
---
title: Replace underscore with lodash for ./app/assets/javascripts/badges
merge_request: 24966
author: Jacopo Beschi @jacopo-beschi
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment