Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 14 insertions, 10 deletions

diff --git a/lefthook.yml b/lefthook.yml
index 3469cd9bddf..9284b872e7f 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -5,32 +5,36 @@ pre-push:
       run: bundle exec danger dry_run
     eslint:
       tags: frontend style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "*.{js,vue}"
-      run: yarn eslint --cache --max-warnings 0 --report-unused-disable-directives {files}
+      run: yarn run lint:eslint {files}
     haml-lint:
       tags: view haml style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "*.html.haml"
       run: bundle exec haml-lint --config .haml-lint.yml {files}
     markdownlint:
       tags: documentation style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "doc/*.md"
       run: yarn markdownlint {files}
-    scss-lint:
+    stylelint:
       tags: stylesheet css style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "*.scss{,.css}"
-      exclude: "app/assets/stylesheets/pages/emojis.scss"
-      run: bundle exec scss-lint --config .scss-lint.yml {files}
+      run: yarn stylelint -q {files}
+    prettier:
+      tags: frontend style
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
+      glob: "*.{js,vue,graphql}"
+      run: yarn run prettier --check {files}
     rubocop:
       tags: backend style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "*.rb"
       run: bundle exec rubocop --parallel --force-exclusion {files}
     vale:  # Requires Vale: https://docs.gitlab.com/ee/development/documentation/#install-linters
       tags: documentation style
-      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      files: git diff --name-only --diff-filter=d $(git merge-base origin/master HEAD)..HEAD
       glob: "doc/*.md"
       run: if command -v vale 2> /dev/null; then vale --config .vale.ini --minAlertLevel error {files}; else echo "Vale not found. Install Vale"; fi