Merge branch 'main' into hal

Gemfile.lock

app/assets/images/osuny-black.svg

app/assets/images/osuny-white.svg

app/assets/javascripts/admin/utils/validate_click_form.js

app/assets/stylesheets/admin/appstack/style.sass

app/assets/stylesheets/admin/pure/style.sass

app/assets/stylesheets/admin/pure/variables.sass

app/controllers/admin/application_controller.rb

...trollers/admin/communication/websites/pages_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/education/programs_controller.rb

...ollers/admin/research/journals/papers/kinds_controller.rb

app/controllers/admin/research/journals/papers_controller.rb

...controllers/admin/research/journals/volumes_controller.rb

app/controllers/admin/research/journals_controller.rb

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/communication/block.rb

app/models/communication/website/page/education_diploma.rb