Merge remote-tracking branch 'parent/main' into upstream-20241113

config/routes/admin.rb

@@ -55,8 +55,10 @@ namespace :admin do
     end
   end
 
-  get '/settings', to: redirect('/admin/settings/branding')
-  get '/settings/edit', to: redirect('/admin/settings/branding')
+  with_options to: redirect('/admin/settings/branding') do
+    get '/settings'
+    get '/settings/edit'
+  end
 
   namespace :settings do
     resource :branding, only: [:show, :update], controller: 'branding'