Flag multiple empty lines in eslint, fix offenses.
This commit is contained in:
parent
665dd38752
commit
f0b7e5708c
7 changed files with 6 additions and 27 deletions
|
@ -15,6 +15,7 @@
|
|||
"filenames"
|
||||
],
|
||||
"rules": {
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"]
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"],
|
||||
"no-multiple-empty-lines": ["error", { "max": 1 }]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
//= require ./components/environment
|
||||
//= require ./vue_resource_interceptor
|
||||
|
||||
|
||||
$(() => {
|
||||
window.gl = window.gl || {};
|
||||
|
||||
|
|
|
@ -61,7 +61,6 @@
|
|||
return labels;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Will return only labels that were marked previously and the user has unmarked
|
||||
* @return {Array} Label IDs
|
||||
|
@ -80,7 +79,6 @@
|
|||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Simple form serialization, it will return just what we need
|
||||
* Returns key/value pairs from form data
|
||||
|
|
|
@ -220,7 +220,6 @@
|
|||
})(this));
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Increase @pollingInterval up to 120 seconds on every function call,
|
||||
if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
|
||||
|
@ -244,7 +243,6 @@
|
|||
return this.initRefresh();
|
||||
};
|
||||
|
||||
|
||||
Notes.prototype.handleCreateChanges = function(note) {
|
||||
if (typeof note === 'undefined') {
|
||||
return;
|
||||
|
@ -294,7 +292,6 @@
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Check if note does not exists on page
|
||||
*/
|
||||
|
@ -307,7 +304,6 @@
|
|||
return this.view === 'parallel';
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Render note in discussion area.
|
||||
|
||||
|
@ -358,7 +354,6 @@
|
|||
return this.updateNotesCount(1);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response the main target form has been successfully submitted.
|
||||
|
||||
|
@ -390,7 +385,6 @@
|
|||
return form.find(".js-note-text").trigger("input");
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Shows the main form and does some setup on it.
|
||||
|
||||
|
@ -415,7 +409,6 @@
|
|||
return this.parentTimeline = form.parents('.timeline');
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
General note form setup.
|
||||
|
||||
|
@ -432,7 +425,6 @@
|
|||
return new Autosave(textarea, ["Note", form.find("#note_noteable_type").val(), form.find("#note_noteable_id").val(), form.find("#note_commit_id").val(), form.find("#note_type").val(), form.find("#note_line_code").val(), form.find("#note_position").val()]);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to the new note form being submitted
|
||||
|
||||
|
@ -448,7 +440,6 @@
|
|||
return new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', this.parentTimeline);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to the new note form being submitted
|
||||
|
||||
|
@ -473,7 +464,6 @@
|
|||
this.removeDiscussionNoteForm($form);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to the edit note form being submitted
|
||||
|
||||
|
@ -498,7 +488,6 @@
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
Notes.prototype.checkContentToAllowEditing = function($el) {
|
||||
var initialContent = $el.find('.original-note-content').text().trim();
|
||||
var currentContent = $el.find('.note-textarea').val();
|
||||
|
@ -522,7 +511,6 @@
|
|||
return isAllowed;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to clicking the edit note link
|
||||
|
||||
|
@ -551,7 +539,6 @@
|
|||
this.putEditFormInPlace($target);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to clicking the edit note link
|
||||
|
||||
|
@ -596,7 +583,6 @@
|
|||
return form.find('.js-note-text').val(form.find('form.edit-note').data('original-note'));
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to deleting a note of any kind.
|
||||
|
||||
|
@ -636,7 +622,6 @@
|
|||
return this.updateNotesCount(-1);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to clicking the delete attachment link
|
||||
|
||||
|
@ -653,7 +638,6 @@
|
|||
return note.find(".current-note-edit-form").remove();
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called when clicking on the "reply" button for a diff line.
|
||||
|
||||
|
@ -673,7 +657,6 @@
|
|||
return this.setupDiscussionNoteForm(replyLink, form);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Shows the diff or discussion form and does some setup on it.
|
||||
|
||||
|
@ -715,7 +698,6 @@
|
|||
.addClass("discussion-form js-discussion-note-form");
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called when clicking on the "add a comment" button on the side of a diff line.
|
||||
|
||||
|
@ -772,7 +754,6 @@
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called in response to "cancel" on a diff note form.
|
||||
|
||||
|
@ -806,7 +787,6 @@
|
|||
return this.removeDiscussionNoteForm(form);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called after an attachment file has been selected.
|
||||
|
||||
|
@ -821,7 +801,6 @@
|
|||
return form.find(".js-attachment-filename").text(filename);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Called when the tab visibility changes
|
||||
*/
|
||||
|
|
4
changelogs/unreleased/newline-eslint-rule.yml
Normal file
4
changelogs/unreleased/newline-eslint-rule.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Flag multiple empty lines in eslint, fix offenses.
|
||||
merge_request: 8137
|
||||
author:
|
|
@ -21,7 +21,6 @@
|
|||
messages = $('.abuse-reports .message');
|
||||
});
|
||||
|
||||
|
||||
it('should truncate long messages', () => {
|
||||
const $longMessage = findMessage('LONG MESSAGE');
|
||||
expect($longMessage.data('original-message')).toEqual(jasmine.anything());
|
||||
|
|
|
@ -33,7 +33,6 @@ describe('Rollback Component', () => {
|
|||
expect(component.$el.querySelector('span').textContent).toContain('Re-deploy');
|
||||
});
|
||||
|
||||
|
||||
it('Should render Rollback label when isLastDeployment is false', () => {
|
||||
const component = new window.gl.environmentsList.RollbackComponent({
|
||||
el: document.querySelector('.test-dom-element'),
|
||||
|
|
Loading…
Reference in a new issue