Disable And/Or check, re-enable trailing space check (#7456)

.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 }}

.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