Merge branch 'main' into remove_actiontext_summernote

app/controllers/admin/research/application_controller.rb

app/controllers/admin/research/dashboard_controller.rb

app/controllers/admin/research/journals_controller.rb

app/controllers/admin/research/publications_controller.rb

app/controllers/admin/research/researchers_controller.rb

app/controllers/admin/university/alumni_controller.rb

app/controllers/admin/university/application_controller.rb

app/controllers/admin/university/dashboard_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/concerns/admin/filterable.rb

app/controllers/concerns/admin/translatable.rb

app/controllers/extranet/persons_controller.rb

app/controllers/server/application_controller.rb

app/controllers/server/universities_controller.rb

app/controllers/server/websites_controller.rb

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/administration.rb

app/models/communication.rb

app/models/communication/block.rb