From: Tom Hughes <tom@compton.nu>
Date: Thu, 6 Oct 2022 06:59:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3736'
X-Git-Tag: live~2346
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/31d27da6bc667825df754438985a56f4b593df80?hp=809a8b3db0f09199ae798de102cc926f87958c82

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

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6f88614ab..5f0f0f078 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ on:
   - push
   - pull_request
 concurrency:
-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 jobs:
   test:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5b6668a84..11a4c322f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,7 +3,7 @@ on:
   - push
   - pull_request
 concurrency:
-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 env:
   os: ubuntu-20.04
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c1fa68072..79811c612 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ on:
   - push
   - pull_request
 concurrency:
-  group: ${{ github.workflow }}-{{ github.head_ref || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 jobs:
   test:
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 75396fd73..b2d4abcb7 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -258,15 +258,15 @@ L.OSM.Map = L.Map.extend({
 
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
-      
+
       L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
-      
+
       L.marker(object.latLng, {
         icon: object.icon,
         opacity: 1,
         interactive: true
       }).addTo(this._objectLayer);
-      
+
       if (callback) callback(this._objectLayer.getBounds());
     } else { // element or changeset handled by L.OSM.DataLayer
       var map = this;