Merge "Require indentation of CASE statements in PHP code"

[lhc/web/wiklou.git] / Gruntfile.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 6c56772..d1ef72f 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,8 +44,6 @@ module.exports = function ( grunt ) {
                                '!extensions/**/*.js',
                                '!skins/**/*.js',
                                // Skip functions aren't even parseable
-                               '!resources/src/dom-level2-skip.js',
-                               '!resources/src/es5-skip.js',
                                '!resources/src/mediawiki.hidpi-skip.js'
                        ]
                },
@@ -64,9 +62,6 @@ module.exports = function ( grunt ) {
                        installer: 'includes/installer/i18n/'
                },
                stylelint: {
-                       options: {
-                               syntax: 'less'
-                       },
                        src: '{resources/src,mw-config}/**/*.{css,less}'
                },
                watch: {
@@ -92,7 +87,10 @@ module.exports = function ( grunt ) {
                                singleRun: true,
                                autoWatch: false,
                                // Some tests in extensions don't yield for more than the default 10s (T89075)
-                               browserNoActivityTimeout: 60 * 1000
+                               browserNoActivityTimeout: 60 * 1000,
+                               // Karma requires Same-Origin (or CORS) by default since v1.1.1
+                               // for better stacktraces. But we load the first request from wgServer
+                               crossOriginAttribute: false
                        },
                        main: {
                                browsers: [ 'Chrome' ]