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

[rails.git] / config / eslint.json

diff --git a/config/eslint.json b/config/eslint.json
index 7a9e7d4e4676e8fd8b047d9fd96ed81ab84019fb..22ecdd3db9950f618ae1399fe80c2485e777edef 100644 (file)
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -7,11 +7,12 @@
     "eslint:recommended"
   ],
   "globals": {
     "eslint:recommended"
   ],
   "globals": {

+    "Cookies": "readonly",

     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",
     "Piwik": "readonly",
     "I18n": "readonly",
     "L": "readonly",
     "OSM": "writable",
     "Piwik": "readonly",

-    "require": "readonly",
+    "Qs": "readonly",

     "updateLinks": "readonly"
   },
   "rules": {
     "updateLinks": "readonly"
   },
   "rules": {