Commit e1ba2dd2 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '32486-update-eslint-plugin-import-to-2.18.2-ee-js-ph2' into 'master'

Update eslint-plugin-import from 2.16.0 to 2.18.2 (/ee/app/assets/javascripts, 2nd iteration)

See merge request gitlab-org/gitlab!21534
parents d1b475fd 9b9c62e9
import { isString } from 'underscore';
import dateFormat from 'dateformat';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { convertToSnakeCase } from '~/lib/utils/text_utility'; import { convertToSnakeCase } from '~/lib/utils/text_utility';
import { newDate, dayAfter, secondsToDays } from '~/lib/utils/datetime_utility'; import { newDate, dayAfter, secondsToDays } from '~/lib/utils/datetime_utility';
import { isString } from 'underscore';
import dateFormat from 'dateformat';
import { dateFormats } from '../shared/constants'; import { dateFormats } from '../shared/constants';
const EVENT_TYPE_LABEL = 'label'; const EVENT_TYPE_LABEL = 'label';
......
<script> <script>
import Icon from '~/vue_shared/components/icon.vue';
import { GlPopover, GlLink } from '@gitlab/ui'; import { GlPopover, GlLink } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
export default { export default {
components: { components: {
......
<script> <script>
import createFlash from '~/flash';
import { ApolloMutation } from 'vue-apollo'; import { ApolloMutation } from 'vue-apollo';
import createFlash from '~/flash';
import projectQuery from '../graphql/queries/project.query.graphql'; import projectQuery from '../graphql/queries/project.query.graphql';
import destroyDesignMutation from '../graphql/mutations/destroyDesign.mutation.graphql'; import destroyDesignMutation from '../graphql/mutations/destroyDesign.mutation.graphql';
import { updateStoreAfterDesignsDelete } from '../utils/cache_update'; import { updateStoreAfterDesignsDelete } from '../utils/cache_update';
......
<script> <script>
import { GlButton } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import { GlButton } from '@gitlab/ui';
import Pagination from './pagination.vue'; import Pagination from './pagination.vue';
import DeleteButton from '../delete_button.vue'; import DeleteButton from '../delete_button.vue';
import permissionsQuery from '../../graphql/queries/permissions.query.graphql'; import permissionsQuery from '../../graphql/queries/permissions.query.graphql';
......
import Api from 'ee/api';
import createFlash from '~/flash'; import createFlash from '~/flash';
import { __ } from '~/locale'; import { __ } from '~/locale';
import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
import Api from 'ee/api';
import * as types from './mutation_types'; import * as types from './mutation_types';
// Fetch Designs // Fetch Designs
......
import Vue from 'vue'; import Vue from 'vue';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import { joinPaths } from '~/lib/utils/url_utility';
import store from 'ee/insights/stores'; import store from 'ee/insights/stores';
import { joinPaths } from '~/lib/utils/url_utility';
Vue.use(VueRouter); Vue.use(VueRouter);
......
import Api from 'ee/api';
import { backOff } from '~/lib/utils/common_utils'; import { backOff } from '~/lib/utils/common_utils';
import httpStatusCodes from '~/lib/utils/http_status'; import httpStatusCodes from '~/lib/utils/http_status';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import flash from '~/flash'; import flash from '~/flash';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import Api from 'ee/api';
import * as types from './mutation_types'; import * as types from './mutation_types';
const requestLogsUntilData = ({ projectPath, environmentId, podName }) => const requestLogsUntilData = ({ projectPath, environmentId, podName }) =>
......
<script> <script>
import { s__, sprintf } from '~/locale';
import { GlTab, GlTabs } from '@gitlab/ui'; import { GlTab, GlTabs } from '@gitlab/ui';
import { s__, sprintf } from '~/locale';
import CodeInstruction from './code_instruction.vue'; import CodeInstruction from './code_instruction.vue';
export default { export default {
......
<script> <script>
import { s__, sprintf } from '~/locale';
import { GlTab, GlTabs } from '@gitlab/ui'; import { GlTab, GlTabs } from '@gitlab/ui';
import { s__, sprintf } from '~/locale';
import CodeInstruction from './code_instruction.vue'; import CodeInstruction from './code_instruction.vue';
export default { export default {
......
<script> <script>
import { uniqueId } from 'underscore'; import { uniqueId } from 'underscore';
import { sprintf, s__ } from '~/locale';
import { GlLink, GlIntersperse, GlModal, GlButton, GlModalDirective } from '@gitlab/ui'; import { GlLink, GlIntersperse, GlModal, GlButton, GlModalDirective } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale';
const MODAL_ID_PREFIX = 'license-component-link-modal-'; const MODAL_ID_PREFIX = 'license-component-link-modal-';
export const VISIBLE_COMPONENT_COUNT = 2; export const VISIBLE_COMPONENT_COUNT = 2;
......
...@@ -5,8 +5,8 @@ import { GlLoadingIcon } from '@gitlab/ui'; ...@@ -5,8 +5,8 @@ import { GlLoadingIcon } from '@gitlab/ui';
import { issuableTypesMap } from 'ee/related_issues/constants'; import { issuableTypesMap } from 'ee/related_issues/constants';
import SlotSwitch from '~/vue_shared/components/slot_switch.vue';
import AddItemForm from 'ee/related_issues/components/add_issuable_form.vue'; import AddItemForm from 'ee/related_issues/components/add_issuable_form.vue';
import SlotSwitch from '~/vue_shared/components/slot_switch.vue';
import CreateEpicForm from './create_epic_form.vue'; import CreateEpicForm from './create_epic_form.vue';
import CreateIssueForm from './create_issue_form.vue'; import CreateIssueForm from './create_issue_form.vue';
import IssueActionsSplitButton from './issue_actions_split_button.vue'; import IssueActionsSplitButton from './issue_actions_split_button.vue';
......
...@@ -3,10 +3,10 @@ import { mapState, mapActions } from 'vuex'; ...@@ -3,10 +3,10 @@ import { mapState, mapActions } from 'vuex';
import { GlButton, GlTooltipDirective } from '@gitlab/ui'; import { GlButton, GlTooltipDirective } from '@gitlab/ui';
import { issuableTypesMap } from 'ee/related_issues/constants';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { issuableTypesMap } from 'ee/related_issues/constants';
import EpicActionsSplitButton from './epic_actions_split_button.vue'; import EpicActionsSplitButton from './epic_actions_split_button.vue';
......
import { PathIdSeparator } from 'ee/related_issues/constants';
import createGqClient from '~/lib/graphql'; import createGqClient from '~/lib/graphql';
import { PathIdSeparator } from 'ee/related_issues/constants';
import { ChildType } from '../constants'; import { ChildType } from '../constants';
export const gqClient = createGqClient(); export const gqClient = createGqClient();
......
<script> <script>
import { __, sprintf } from '~/locale';
import { GlLink } from '@gitlab/ui'; import { GlLink } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
export default { export default {
......
...@@ -2,15 +2,14 @@ ...@@ -2,15 +2,14 @@
import { mapState, mapGetters, mapActions } from 'vuex'; import { mapState, mapGetters, mapActions } from 'vuex';
import dateFormat from 'dateformat'; import dateFormat from 'dateformat';
import { GlTooltipDirective, GlTable } from '@gitlab/ui';
import { GlSparklineChart } from '@gitlab/ui/dist/charts';
import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import { firstAndLastY } from '~/lib/utils/chart_utils'; import { firstAndLastY } from '~/lib/utils/chart_utils';
import { formattedChangeInPercent } from '~/lib/utils/number_utils'; import { formattedChangeInPercent } from '~/lib/utils/number_utils';
import { GlTooltipDirective, GlTable } from '@gitlab/ui';
import { GlSparklineChart } from '@gitlab/ui/dist/charts';
import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
import ChartButtons from './vulnerability_chart_buttons.vue'; import ChartButtons from './vulnerability_chart_buttons.vue';
import { DAY_IN_MS, DAYS } from '../store/modules/vulnerabilities/constants'; import { DAY_IN_MS, DAYS } from '../store/modules/vulnerabilities/constants';
......
import Vue from 'vue'; import Vue from 'vue';
import getFileLocation from 'ee/vue_shared/security_reports/store/utils/get_file_location';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
import getFileLocation from 'ee/vue_shared/security_reports/store/utils/get_file_location';
import * as types from './mutation_types'; import * as types from './mutation_types';
import { DAYS } from './constants'; import { DAYS } from './constants';
import { isSameVulnerability } from './utils'; import { isSameVulnerability } from './utils';
......
<script> <script>
import { GlModal, GlButton } from '@gitlab/ui'; import { GlModal, GlButton } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import _ from 'underscore'; import _ from 'underscore';
import { __, sprintf } from '~/locale';
export default { export default {
name: 'MergeImmediatelyConfirmationDialog', name: 'MergeImmediatelyConfirmationDialog',
......
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