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

[rails.git] / config / settings.yml

diff --git a/config/settings.yml b/config/settings.yml
index 316744f314450eaaaede7ce9037e8ffe0842a64c..e0e844778f6fc1eeab8a6f7cb52ded25a2db0f4f 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -86,8 +86,7 @@ default_editor: "id"
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
   # Current Google imagery URLs have google or googleapis in the domain
-  # with a vt or kh endpoint, and x, y and z or pb-based query parameters
-  - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*|!\d[a-z]\d+){3}.*"
+  - ".*\\.google(apis)?\\..*/.*"
   # Blacklist VWorld
   - "http://xdworld\\.vworld\\.kr:8080/.*"
   # Blacklist here