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

diff --git a/Gemfile.lock b/Gemfile.lock
index 761beefa3a0555cab7acda87d1585bb7b98df05e..0fd4dc5ea1662aa9055b3f31df547b9020149eb4 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,7 +60,7 @@ GEM
       activemodel (= 7.2.2.1)
       activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
-    activerecord-import (2.0.0)
+    activerecord-import (2.1.0)
       activerecord (>= 4.2)
     activestorage (7.2.2.1)
       actionpack (= 7.2.2.1)
@@ -92,8 +92,8 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1043.0)
-    aws-sdk-core (3.217.0)
+    aws-partitions (1.1044.0)
+    aws-sdk-core (3.217.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -101,7 +101,7 @@ GEM
     aws-sdk-kms (1.97.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.178.0)
+    aws-sdk-s3 (1.179.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -237,7 +237,7 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.8.1)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -260,8 +260,8 @@ GEM
     erubi (1.13.1)
     execjs (2.10.0)
     exifr (1.4.1)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -451,7 +451,7 @@ GEM
     open4 (1.3.4)
     openstreetmap-deadlock_retry (1.3.1)
     ostruct (0.6.1)
-    overcommit (0.65.0)
+    overcommit (0.66.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
@@ -549,14 +549,14 @@ GEM
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.71.0)
+    rubocop (1.71.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.38.0)

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index dd4f4149386c69f5cb75e8dfefbd6f9b4bc094b7..fea7e73145415ecf36bca270b53f19feab5683f3 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -35,7 +35,7 @@ OSM.initializeContextMenu = function (map) {
   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.show_address"),
     callback: function describeLocation(e) {
-      const [lat, lon] = OSM.cropLocation(e.latlng, map.getZoom()).map(encodeURIComponent);
+      const [lat, lon] = OSM.cropLocation(e.latlng, map.getZoom());
 
       OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));
     }

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 46a8fa28f4c638fbfcf9395f1efa3bed07d5f857..e54c5132c65ab4dca495aa72bfc9ed380718df7b 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -31,7 +31,7 @@ OSM.Search = function (map) {
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
     $("header").addClass("closed");
-    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom()).map(encodeURIComponent);
+    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom());
 
     OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));
   });

diff --git a/test/system/create_note_test.rb b/test/system/create_note_test.rb
index dd13a286f55e3061be1c51bbba764fcc24628ce5..410d5dfb7b0fdcaa0e0a42486445a2117cde4044 100644 (file)
--- a/test/system/create_note_test.rb
+++ b/test/system/create_note_test.rb
@@ -23,7 +23,7 @@ class CreateNoteTest < ApplicationSystemTestCase
       fill_in "text", :with => "Some newly added note description"
       click_on "Add Note"
 
-      assert_content "Unresolved note ##{Note.last.id}"
+      assert_content "Unresolved note #"
       assert_content "Some newly added note description"
     end
   end
@@ -56,7 +56,7 @@ class CreateNoteTest < ApplicationSystemTestCase
 
       click_on "Add Note"
 
-      assert_content "Unresolved note ##{Note.last.id}"
+      assert_content "Unresolved note #"
       assert_content "Some newly added note description"
     end
   end