Merge remote-tracking branch 'upstream/main' into cursor/split-sidebar-membership-queries-8545

Co-authored-by: Thomas Klemm <github@tklemm.eu>

test/controllers/users/profiles_controller_test.rb

@@ -11,6 +11,13 @@ class Users::ProfilesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "show includes install instructions for Edge" do
+    get user_profile_url, headers: { "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18363" }
+
+    assert_response :success
+    assert_select ".pwa__instructions img[src*='install-edge']"
+  end
+
   test "update" do
     put user_profile_url, params: { user: { name: "John Doe", bio: "Acrobat" } }