merge

.ruby-version

Gemfile

Gemfile.lock

app/controllers/active_storage/blobs/redirect_controller.rb

...ers/active_storage/representations/redirect_controller.rb

app/controllers/admin/education/programs_controller.rb

app/controllers/admin/education/teachers_controller.rb

app/models/ability.rb

app/models/education/program.rb

app/models/user.rb

app/views/admin/education/teachers/show.html.erb

app/views/admin/education/teachers/show/_programs.html.erb

app/views/admin/research/journals/papers/_list.html.erb

app/views/admin/research/journals/volumes/index.html.erb

app/views/admin/research/journals/volumes/show.html.erb

bin/rails

bin/rake

bin/setup

config/application.rb

config/boot.rb