Merge branch 'main' into update-dependencies

app/assets/javascripts/leaflet.js

app/assets/stylesheets/admin/commons/sidebar.sass

app/assets/stylesheets/leaflet.sass

app/views/admin/communication/blocks/edit.html.erb

...mmunication/blocks/templates/organizations/_show.html.erb

app/views/admin/communication/extranets/_sidebar.html.erb

...iews/admin/communication/photo_imports/_selector.html.erb

app/views/admin/communication/websites/_sidebar.html.erb

app/views/admin/layouts/application.html.erb

app/views/admin/layouts/preview.html.erb

app/views/admin/research/journals/_sidebar.html.erb

app/views/application/_bugsnag.html.erb

app/views/extranet/layouts/application.html.erb

app/views/server/layouts/application.html.erb

app/views/server/universities/_sso_mapping.html.erb

config/initializers/content_security_policy.rb

db/schema.rb

package.json

yarn.lock