From db5a2c68e6e373cfda9896d88b82f0e399a0580e Mon Sep 17 00:00:00 2001 From: supechicken Date: Tue, 4 Oct 2022 21:16:08 +0800 Subject: [PATCH] Disable `And/Or` check, re-enable trailing space check (#7456) --- .github/workflows/Rubocop.yml | 2 +- .rubocop.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Rubocop.yml b/.github/workflows/Rubocop.yml index 800585a21..ecbc5d35f 100644 --- a/.github/workflows/Rubocop.yml +++ b/.github/workflows/Rubocop.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: rubocop + - name: Rubocop uses: Freshly/Octocop@v0.0.2 with: github_token: ${{ secrets.github_token }} diff --git a/.rubocop.yml b/.rubocop.yml index 5c90e2639..d549a6bef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -62,9 +62,6 @@ Metrics/BlockNesting: Metrics/ParameterLists: Enabled: false -Layout/TrailingWhitespace: - Enabled: false - Layout/LineContinuationLeadingSpace: Enabled: false @@ -127,6 +124,9 @@ Layout/FirstHashElementIndentation: Layout/IndentationStyle: EnforcedStyle: spaces +Style/AndOr: + Enabled: false + Style/RedundantReturn: Enabled: false