From: Tom Hughes Date: Wed, 10 Apr 2024 17:39:06 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4645' X-Git-Tag: live~200 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/52a8e2a0d91355ba152443a63cc8c9744240a907?hp=fe9cd86b176973ee9e1b9b88725257370e249f94 Merge remote-tracking branch 'upstream/pull/4645' --- diff --git a/Gemfile.lock b/Gemfile.lock index 00bf5384b..f3e39e829 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.909.0) + aws-partitions (1.910.0) aws-sdk-core (3.191.6) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -475,7 +475,7 @@ GEM rdoc (6.6.3.1) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.5.0) + reline (0.5.1) io-console (~> 0.5) request_store (1.6.0) rack (>= 1.4) @@ -485,7 +485,7 @@ GEM rouge (4.2.1) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.62.1) + rubocop (1.63.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) diff --git a/app/assets/images/avatar.svg b/app/assets/images/avatar.svg new file mode 100644 index 000000000..46d761b6d --- /dev/null +++ b/app/assets/images/avatar.svg @@ -0,0 +1,6 @@ + + + + diff --git a/app/assets/images/avatars.svg b/app/assets/images/avatars.svg deleted file mode 100644 index 85288b242..000000000 --- a/app/assets/images/avatars.svg +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 27311f7c1..b78ac6e07 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -5,26 +5,30 @@ L.OSM.layers = function (options) { var layers = options.layers; var baseSection = $("
") - .attr("class", "section base-layers") + .attr("class", "section base-layers d-grid gap-3") .appendTo($ui); - var baseLayers = $(" diff --git a/config/locales/en.yml b/config/locales/en.yml index 0634fc2a0..f9117ca1c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2991,6 +2991,7 @@ en: blocks_on_user: "Blocks on %{user}" blocks_by_me: "Blocks by Me" blocks_by_user: "Blocks by %{user}" + block: "Block #%{id}" user_mutes: index: title: "Muted Users" diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 34120e207..a905090db 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -91,5 +91,5 @@ class ApplicationHelperTest < ActionView::TestCase def test_body_class; end - def test_current_page_class; end + def test_header_nav_link_class; end end diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index e72887798..f7d2726db 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -8,12 +8,12 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_image(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(user, :class => "foo") - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_image(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -24,13 +24,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(user, :class => "foo") - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail(gravatar_user, :class => "foo") assert_match %r{^$}, image @@ -41,13 +41,13 @@ class UserHelperTest < ActionView::TestCase gravatar_user = create(:user, :image_use_gravatar => true) image = user_thumbnail_tiny(user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(user, :class => "foo") - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user) - assert_match %r{^$}, image + assert_match %r{^$}, image image = user_thumbnail_tiny(gravatar_user, :class => "foo") assert_match %r{^$}, image