diff --git a/.rubocop/style.yml b/.rubocop/style.yml index ee3ce39937..7dd4299c3e 100644 --- a/.rubocop/style.yml +++ b/.rubocop/style.yml @@ -22,6 +22,10 @@ Style/HashSyntax: EnforcedShorthandSyntax: either EnforcedStyle: ruby19_no_mixed_keys +Style/IfUnlessModifier: + Exclude: + - '**/*.haml' + Style/KeywordArgumentsMerging: Enabled: false diff --git a/app/views/.rubocop.yml b/app/views/.rubocop.yml deleted file mode 100644 index 4e268848c7..0000000000 --- a/app/views/.rubocop.yml +++ /dev/null @@ -1,5 +0,0 @@ -inherit_from: ../../.rubocop.yml - -# Disable for the `Rubocop` lints in haml-lint -Style/IfUnlessModifier: - Enabled: false