Merge remote-tracking branch 'upstream/pull/2014'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index abf25d3cd47a57968b6a0cf595c68150c48b69a2..b33f9046cb87c117925cc8e290392f2021aae270 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -56,10 +56,6 @@ Style/FormatStringToken:
 Style/IfInsideElse:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false
 

-Style/GlobalVars:
-  Exclude:
-    - 'lib/quad_tile/extconf.rb'
-

 Style/GuardClause:
   Enabled: false
 
 Style/GuardClause:
   Enabled: false