From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Oct 2018 17:54:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2012'
X-Git-Tag: live~2886
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8877427ab9e49f509414c2fa4d71ccc3e2ac8796?hp=5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 31c14773c..cb301ece1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -56,10 +56,6 @@ Style/FormatStringToken:
 Style/IfInsideElse:
   Enabled: false
 
-Style/GlobalVars:
-  Exclude:
-    - 'lib/quad_tile/extconf.rb'
-
 Style/GuardClause:
   Enabled: false