Commit 62945ef8 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'lm-replace-lodash-ee-billings' into 'master'

Replace underscore with lodash in ee/app/assets/javascripts/billing

See merge request gitlab-org/gitlab!27053
parents ec14149a 79946e4f
<script> <script>
import _ from 'underscore'; import { escape as esc } from 'lodash';
import { mapActions, mapState, mapGetters } from 'vuex'; import { mapActions, mapState, mapGetters } from 'vuex';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
...mapState('subscription', ['isLoading', 'hasError', 'plan', 'tables', 'endpoint']), ...mapState('subscription', ['isLoading', 'hasError', 'plan', 'tables', 'endpoint']),
...mapGetters('subscription', ['isFreePlan']), ...mapGetters('subscription', ['isFreePlan']),
subscriptionHeader() { subscriptionHeader() {
const planName = this.isFreePlan ? s__('SubscriptionTable|Free') : _.escape(this.plan.name); const planName = this.isFreePlan ? s__('SubscriptionTable|Free') : esc(this.plan.name);
const suffix = !this.isFreePlan && this.plan.trial ? s__('SubscriptionTable|Trial') : ''; const suffix = !this.isFreePlan && this.plan.trial ? s__('SubscriptionTable|Trial') : '';
return `${this.namespaceName}: ${planName} ${suffix}`; return `${this.namespaceName}: ${planName} ${suffix}`;
......
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