Merge remote-tracking branch 'upstream/pull/5153'

[rails.git] / lib / tasks / eslint.rake

diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 7f96531d9d0835ece408c9ad3dedc0d99fadfb1f..790ef150d6e7b3220921348ee373857eb86356de 100644 (file)
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -5,7 +5,7 @@ def yarn_path
 end
 
 def config_file
 end
 
 def config_file

-  Rails.root.join("config/eslint.json").to_s
+  Rails.root.join("config/eslint.js").to_s

 end
 
 def js_files
 end
 
 def js_files