From: Tom Hughes <tom@compton.nu>
Date: Wed, 10 May 2017 16:01:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1538'
X-Git-Tag: live~4511
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7d95a576cd28c51ea60ec498713838adda7be06c?hp=3f3ffdfea1ecb57fb95e24b71ed070c8f9fbedbd

Merge remote-tracking branch 'openstreetmap/pull/1538'
---

diff --git a/.mailmap b/.mailmap
index e4c19a34c..29f21fde6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@ Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
 Michael Glanznig <nebulon42@yandex.com>
 Petr Kadlec <mormegil@centrum.cz>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>
+Simon Poole <simon@poole.ch> <simon@rails-dev.poole.ch>
diff --git a/config/example.application.yml b/config/example.application.yml
index 45c0a39c4..9c5c7a180 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -95,6 +95,8 @@ defaults: &defaults
     - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
     # Blacklist VWorld
     - "http://xdworld\\.vworld\\.kr:8080/.*"
+    # Blacklist here
+    - ".*\\.here\\.com[/:].*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints