Commit c8e227ec authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'resolve_gitlab_issue_196651' into 'master'

Replace underscore with lodash for ./app/assets/javascripts/serverless

See merge request gitlab-org/gitlab!25011
parents 1cc0d426 2ba01b6a
<script> <script>
import _ from 'underscore'; import { isString } from 'lodash';
import { mapState, mapActions, mapGetters } from 'vuex'; import { mapState, mapActions, mapGetters } from 'vuex';
import PodBox from './pod_box.vue'; import PodBox from './pod_box.vue';
import Url from './url.vue'; import Url from './url.vue';
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
return this.func.name; return this.func.name;
}, },
description() { description() {
return _.isString(this.func.description) ? this.func.description : ''; return isString(this.func.description) ? this.func.description : '';
}, },
funcUrl() { funcUrl() {
return this.func.url; return this.func.url;
......
<script> <script>
import _ from 'underscore'; import { isString } from 'lodash';
import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import Timeago from '~/vue_shared/components/time_ago_tooltip.vue';
import Url from './url.vue'; import Url from './url.vue';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
return this.func.name; return this.func.name;
}, },
description() { description() {
if (!_.isString(this.func.description)) { if (!isString(this.func.description)) {
return ''; return '';
} }
......
---
title: Replace underscore with lodash for ./app/assets/javascripts/serverless
merge_request: 25011
author: Tobias Spagert
type: other
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