From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Aug 2020 08:09:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2756'
X-Git-Tag: live~3018
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2e2bcc6991a925c04598de2626ce572595bdd12b?ds=inline;hp=-c

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

2e2bcc6991a925c04598de2626ce572595bdd12b
diff --combined package.json
index a17d41b64,27d2ff070..7e12125bc
--- a/package.json
+++ b/package.json
@@@ -7,8 -7,8 +7,8 @@@
      "jquery-simulate": "^1.0.2",
      "jquery.cookie": "^1.4.1",
      "leaflet": "^1.6.0",
 -    "leaflet.locatecontrol": "^0.71.1",
 +    "leaflet.locatecontrol": "^0.72.0",
-     "ohauth": "^0.2.2",
+     "ohauth": "^1.0.0",
      "qs": "^6.9.4"
    },
    "devDependencies": {
diff --combined yarn.lock
index f79c1a82b,4b298ba11..5e5acb37b
--- a/yarn.lock
+++ b/yarn.lock
@@@ -467,10 -467,10 +467,10 @@@ js-yaml@^3.13.1
      argparse "^1.0.7"
      esprima "^4.0.0"
  
- jshashes@~1.0.3:
-   version "1.0.7"
-   resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.7.tgz#bed8c97a0e9632fd0513916f55f76dd5486be59f"
-   integrity sha1-vtjJeg6WMv0FE5FvVfdt1Uhr5Z8=
+ jshashes@~1.0.0:
+   version "1.0.8"
+   resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.8.tgz#f60d837428383abf73ab022e1542e6614bd75514"
+   integrity sha512-btmQZ/w1rj8Lb6nEwvhjM7nBYoj54yaEFo2PWh3RkxZ8qNwuvOxvQYN/JxVuwoMmdIluL+XwYVJ+pEEZoSYybQ==
  
  json-schema-traverse@^0.4.1:
    version "0.4.1"
@@@ -482,10 -482,10 +482,10 @@@ json-stable-stringify-without-jsonify@^
    resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
    integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
  
 -leaflet.locatecontrol@^0.71.1:
 -  version "0.71.1"
 -  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.71.1.tgz#3dd8f4222751b820eb142818bdba7b458bf9fd29"
 -  integrity sha512-YTZ+75NfdIwq/yFUmi5tNBeXxy4kEbDry84ArFJGdSzvBNddk2cLUa498xZDE41KC00jY23NIbWyYowp0MZOPQ==
 +leaflet.locatecontrol@^0.72.0:
 +  version "0.72.0"
 +  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.72.0.tgz#7de5c109a0e10a928bae85e4996e5efa49a3c905"
 +  integrity sha512-enAf10UG9Z1bV0siTP/+vG/ZVncDqSA3V8c6iZ3s6KWL5Ngkk4A4mk9Ssefj46ey98I9HSYWqoS+k2Y7EaKjwQ==
  
  leaflet@^1.6.0:
    version "1.6.0"
@@@ -534,13 -534,13 +534,13 @@@ natural-compare@^1.4.0
    resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
    integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
  
- ohauth@^0.2.2:
-   version "0.2.2"
-   resolved "https://registry.yarnpkg.com/ohauth/-/ohauth-0.2.2.tgz#6d28fbddd15a710a076b9128b457f503e869c853"
-   integrity sha1-bSj73dFacQoHa5EotFf1A+hpyFM=
+ ohauth@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.yarnpkg.com/ohauth/-/ohauth-1.0.0.tgz#c2e8bff3bef0ae491447922243e1ba705117de4b"
+   integrity sha1-wui/877wrkkUR5IiQ+G6cFEX3ks=
    dependencies:
-     jshashes "~1.0.3"
-     xtend "^4.0.0"
+     jshashes "~1.0.0"
+     xtend "~4.0.0"
  
  once@^1.3.0:
    version "1.4.0"
@@@ -751,7 -751,7 +751,7 @@@ write@1.0.3
    dependencies:
      mkdirp "^0.5.1"
  
- xtend@^4.0.0:
+ xtend@~4.0.0:
    version "4.0.2"
    resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
    integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==