diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-19 18:07:55 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-19 18:07:55 +0000 |
| commit | e0da61bca80485b99f78ef1dbb3c64578d64d55a (patch) | |
| tree | 4f7b9363d89b6bbf39fd2cc735006d0046a3c589 | |
| parent | 3a583b075bb9bfa6b5cfe696aca45eeec37251b3 (diff) | |
| parent | a6312081d811d87ea2c3778c52acaa8476361eff (diff) | |
| download | gitlab-ce-e0da61bca80485b99f78ef1dbb3c64578d64d55a.tar.gz | |
Merge branch 'leipert-proper-eslint-report' into 'master'
use eslint cli option instead of sed
See merge request gitlab-org/gitlab-ce!19939
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7304b9c057..30c21b452e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -816,8 +816,6 @@ lint:javascript:report: before_script: [] script: - date - - find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files - - date - yarn run eslint-report || true # ignore exit code artifacts: name: eslint-report diff --git a/package.json b/package.json index 6a52af10dc3..cfe347c6eaa 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dev-server": "nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'", "eslint": "eslint --max-warnings 0 --ext .js,.vue .", "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .", - "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .", + "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js", "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js", "karma-start": "BABEL_ENV=karma karma start config/karma.config.js", |