From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 12 Feb 2025 09:40:16 +0000 (+0000)
Subject: Merge pull request #5658 from tomhughes/flash-skip-terms
X-Git-Tag: live~302
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d642adc6e48798a6daa9a02a8a148a22e4d1f300?hp=43f40c5d036aaea80f5dae040c88f2a4cabdf8ff

Merge pull request #5658 from tomhughes/flash-skip-terms

Stop using session flash to communicate with callbacks
---

diff --git a/DOCKER.md b/DOCKER.md
index b93bf6d50..4cfc6d736 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -56,7 +56,7 @@ This is a workaround. [See issues/2185 for details](https://github.com/openstree
 touch config/settings.local.yml
 ```
 
-**Windows users:** `touch` is not an availible command in Windows so just create a `settings.local.yml` file in the `config` directory, or if you have WSL you can run `wsl touch config/settings.local.yml`.
+**Windows users:** `touch` is not an available command in Windows so just create a `settings.local.yml` file in the `config` directory, or if you have WSL you can run `wsl touch config/settings.local.yml`.
 
 ## Installation
 
diff --git a/yarn.lock b/yarn.lock
index 5d68101b7..9e73a5eb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -256,9 +256,9 @@ eslint-visitor-keys@^4.2.0:
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
 eslint@^9.0.0:
-  version "9.20.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.0.tgz#6244c46c1640cd5e577a31ebc460fca87838c0b7"
-  integrity sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==
+  version "9.20.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.1.tgz#923924c078f5226832449bac86662dd7e53c91d6"
+  integrity sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"