Commit 2fc03829 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'revert-738e0e9e' into 'master'

Revert "Merge branch 'leipert-to-eslint-6' into 'master'"

Closes #202187

See merge request gitlab-org/gitlab!24547
parents cbd73d86 3d785164
......@@ -51,10 +51,8 @@ rules:
no-jquery/no-serialize: error
promise/always-return: off
promise/no-callback-in-promise: off
# Make update to eslint@6 smoother:
prefer-object-spread: off
overrides:
- files:
files:
- '**/spec/**/*'
rules:
"@gitlab/i18n/no-non-i18n-strings": off
/* eslint-disable max-classes-per-file */
import $ from 'jquery';
import Pikaday from 'pikaday';
import dateFormat from 'dateformat';
......
/* eslint-disable max-classes-per-file, one-var, consistent-return */
/* eslint-disable one-var, consistent-return */
import $ from 'jquery';
import _ from 'underscore';
......
......@@ -61,7 +61,7 @@ export default {
eventHub.$emit('EnablePolling');
},
updateTimer() {
this.timer -= 1;
this.timer = this.timer - 1;
if (this.timer === 0) {
this.refresh();
......
......@@ -113,7 +113,7 @@ export default {
/>
<apollo-mutation
v-else
v-slot="{ mutate, loading }"
v-slot="{ mutate, loading, error }"
:mutation="$options.createNoteMutation"
:variables="{
input: mutationPayload,
......
......@@ -43,7 +43,7 @@ export default class GroupMemberStore {
sortMembers(sortByColumn) {
if (sortByColumn) {
this.state.currentSortedColumn = sortByColumn;
this.state.sortOrders[sortByColumn] *= -1;
this.state.sortOrders[sortByColumn] = this.state.sortOrders[sortByColumn] * -1;
const currentColumnOrder = this.state.sortOrders[sortByColumn] || 1;
const members = this.state.members.slice().sort((a, b) => {
......
/* eslint-disable func-names, no-var, no-alert */
/* eslint-disable func-names, prefer-arrow-callback, no-var, no-alert */
/* global $ */
/* global AP */
......
......@@ -6,12 +6,6 @@ plugins:
extends:
- 'plugin:jest/recommended'
settings:
# We have to teach eslint-plugin-import what node modules we use
# otherwise there is an error when it tries to resolve them
import/core-modules:
- events
- fs
- path
import/resolver:
jest:
jestConfigFile: 'jest.config.js'
......
/* eslint-disable arrow-body-style */
import $ from 'jquery';
import GlFieldErrors from '~/gl_field_errors';
......
......@@ -18,7 +18,7 @@ describe('IssueAssigneesComponent', () => {
...props,
},
});
vm = wrapper.vm;
vm = wrapper.vm; // eslint-disable-line
};
const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text();
......
This diff is collapsed.
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