diff --git a/.eslintrc b/.eslintrc index b58007d90a96d730e699ed95643069ad4174bf56..fd26215b84399973f3316d440a262b7406082c70 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,7 @@ "filenames" ], "rules": { - "filenames/match-regex": [2, "^[a-z_]+$"] + "filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"] }, "globals": { "$": false, diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7dd9adac736ef706dfb76cb5fcba09269045a963..d56eb4c01997cec0f162930f9805bf76daf40790 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,7 @@ /*= require jquery-ui/sortable */ /*= require jquery_ujs */ /*= require jquery.endless-scroll */ +/*= require jquery.timeago */ /*= require jquery.highlight */ /*= require jquery.waitforimages */ /*= require jquery.atwho */ diff --git a/changelogs/unreleased/fix-invalid-filename-eslint.yml b/changelogs/unreleased/fix-invalid-filename-eslint.yml new file mode 100644 index 0000000000000000000000000000000000000000..eea21149c907be37ffa4464e2d832dedaa4684b9 --- /dev/null +++ b/changelogs/unreleased/fix-invalid-filename-eslint.yml @@ -0,0 +1,4 @@ +--- +title: Fix invalid filename validation on eslint +merge_request: 7281 +author: diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js index 1e2072f370aacd413b7974f6e63fb36dc02f6cb3..49dfeab61d834237891808d32c38bb9f85e654b2 100644 --- a/spec/javascripts/merge_request_widget_spec.js +++ b/spec/javascripts/merge_request_widget_spec.js @@ -1,6 +1,6 @@ /* eslint-disable */ /*= require merge_request_widget */ -/*= require lib/utils/jquery.timeago.js */ +/*= require jquery.timeago.js */ (function() { describe('MergeRequestWidget', function() { diff --git a/app/assets/javascripts/lib/utils/jquery.timeago.js b/vendor/assets/javascripts/jquery.timeago.js similarity index 100% rename from app/assets/javascripts/lib/utils/jquery.timeago.js rename to vendor/assets/javascripts/jquery.timeago.js