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-28 12:09:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-28 12:09:01 +0300
commit67cdfd2683b89bce260600fa8925eefdcdf9e3e5 (patch)
tree5d01075e0ef7bc62bb27459f75d79ef138aec660 /app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
parentca2a7ed5bd43483f10fd74f46f31e32614889738 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue')
-rw-r--r--app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
index b43d6ba17d7..831a3ca1658 100644
--- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
+++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
@@ -1,5 +1,5 @@
<script>
-import _ from 'underscore';
+import { escape as esc } from 'lodash';
import { GlModal, GlButton, GlFormInput } from '@gitlab/ui';
import { s__, sprintf } from '~/locale';
@@ -56,7 +56,7 @@ export default {
return sprintf(
this.content,
{
- username: `<strong>${_.escape(this.username)}</strong>`,
+ username: `<strong>${esc(this.username)}</strong>`,
strong_start: '<strong>',
strong_end: '</strong>',
},
@@ -67,7 +67,7 @@ export default {
return sprintf(
s__('AdminUsers|To confirm, type %{username}'),
{
- username: `<code>${_.escape(this.username)}</code>`,
+ username: `<code>${esc(this.username)}</code>`,
},
false,
);