From 055e2ac293d7c79450dcd398a36d7f2382989822 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 3 Nov 2016 16:13:35 -0500
Subject: [PATCH 1/4] Move jquery.timeago to vendor directory

---
 spec/javascripts/merge_request_widget_spec.js                   | 2 +-
 .../lib/utils => vendor/assets/javascripts}/jquery.timeago.js   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {app/assets/javascripts/lib/utils => vendor/assets/javascripts}/jquery.timeago.js (100%)

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
similarity index 100%
rename from app/assets/javascripts/lib/utils/jquery.timeago.js
rename to vendor/assets/javascripts/jquery.timeago.js

From 18dd4cf54b19d3320a417928903354bfb625cfdd Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 3 Nov 2016 16:15:10 -0500
Subject: [PATCH 2/4] Update match-regex to fix filename convention

This allows us to pass .js.es6 files as valid filenames;
---
 .eslintrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,

From 6e1802d0d53fd78ec596f05ef9d066f86bbabd7a Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 3 Nov 2016 21:21:32 -0500
Subject: [PATCH 3/4] Add jquery.timeago.js to application.js

---
 app/assets/javascripts/application.js | 1 +
 1 file changed, 1 insertion(+)

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 */

From 99a000da34d5f4b07548602d6503eb60e00344de Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 3 Nov 2016 21:28:26 -0500
Subject: [PATCH 4/4] Add CHANGELOG entry file

---
 changelogs/unreleased/fix-invalid-filename-eslint.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/fix-invalid-filename-eslint.yml

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: