]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/5402'
authorTom Hughes <tom@compton.nu>
Tue, 11 Mar 2025 18:47:18 +0000 (18:47 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 11 Mar 2025 18:47:18 +0000 (18:47 +0000)
1  2 
app/assets/stylesheets/common.scss
config/locales/en.yml
package.json
yarn.lock

Simple merge
Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
index 737486946001ab12bb4ff5b6368ce8fff7f5738a,964aee3c9968852a33d9f4eddafda5af347700fc..a384f4b0daf5e99f35703f0be569f3ce09876da9
+++ b/yarn.lock
    resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
    integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
  
 -"@humanwhocodes/retry@^0.4.1":
 -  version "0.4.1"
 -  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
 -  integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
 +"@humanwhocodes/retry@^0.4.2":
 +  version "0.4.2"
 +  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.2.tgz#1860473de7dfa1546767448f333db80cb0ff2161"
 +  integrity sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==
  
+ "@observablehq/plot@^0.6.0":
+   version "0.6.17"
+   resolved "https://registry.yarnpkg.com/@observablehq/plot/-/plot-0.6.17.tgz#9a43f785e89e6d4413701e2b24d2ec8cc2700e02"
+   integrity sha512-/qaXP/7mc4MUS0s4cPPFASDRjtsWp85/TbfsciqDgU1HwYixbSbbytNuInD8AcTYC3xaxACgVX06agdfQy9W+g==
+   dependencies:
+     d3 "^7.9.0"
+     interval-tree-1d "^1.0.0"
+     isoformat "^0.2.0"
+ "@popperjs/core@^2.11.6":
+   version "2.11.8"
+   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
  "@stylistic/eslint-plugin-js@^4.0.0":
 -  version "4.0.1"
 -  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.0.1.tgz#c55e59ad2f00914f9eb103ba9e7be00aff7715dd"
 -  integrity sha512-2EGKM6WHnZSidWKCu6ePJCqdpgWiEU1Bt26ktWEfTpCmRP+2vRQ6ViK8X6DLwu4+F0zPLy/Txe2HhI3qJFUvqA==
 +  version "4.2.0"
 +  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz#30536fd35dd6aba08c1e234fe37bf66831c6e989"
 +  integrity sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==
    dependencies:
      eslint-visitor-keys "^4.2.0"
      espree "^10.3.0"