diff options
| -rw-r--r-- | .eslintrc | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-invalid-filename-eslint.yml | 4 | ||||
| -rw-r--r-- | spec/javascripts/merge_request_widget_spec.js | 2 | ||||
| -rw-r--r-- | vendor/assets/javascripts/jquery.timeago.js (renamed from app/assets/javascripts/lib/utils/jquery.timeago.js) | 0 |
5 files changed, 7 insertions, 2 deletions
diff --git a/.eslintrc b/.eslintrc index b58007d90a9..fd26215b843 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 7dd9adac736..d56eb4c0199 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 00000000000..eea21149c90 --- /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 1e2072f370a..49dfeab61d8 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 index de76cdd2ea7..de76cdd2ea7 100644 --- a/app/assets/javascripts/lib/utils/jquery.timeago.js +++ b/vendor/assets/javascripts/jquery.timeago.js |