Merge branch 'main' into upgrade/rails-7
Showing
- Gemfile 1 addition, 1 deletionGemfile
- app/controllers/active_storage/base_controller.rb 21 additions, 0 deletionsapp/controllers/active_storage/base_controller.rb
- app/controllers/admin/communication/extranets_controller.rb 1 addition, 1 deletionapp/controllers/admin/communication/extranets_controller.rb
- app/controllers/server/universities_controller.rb 1 addition, 1 deletionapp/controllers/server/universities_controller.rb
- app/helpers/admin/application_helper.rb 2 additions, 2 deletionsapp/helpers/admin/application_helper.rb
- app/models/communication/extranet.rb 1 addition, 0 deletionsapp/models/communication/extranet.rb
- app/models/university.rb 1 addition, 0 deletionsapp/models/university.rb
- app/models/user/with_person.rb 1 addition, 0 deletionsapp/models/user/with_person.rb
- app/views/admin/communication/blocks/templates/organization_chart/_edit.html.erb 1 addition, 1 deletion...cation/blocks/templates/organization_chart/_edit.html.erb
- app/views/admin/communication/extranets/_form.html.erb 1 addition, 0 deletionsapp/views/admin/communication/extranets/_form.html.erb
- app/views/admin/communication/extranets/index.html.erb 1 addition, 1 deletionapp/views/admin/communication/extranets/index.html.erb
- app/views/admin/communication/websites/configs/permalinks/static.html.erb 2 additions, 1 deletion...communication/websites/configs/permalinks/static.html.erb
- app/views/admin/education/programs/forms/_part.html.erb 6 additions, 0 deletionsapp/views/admin/education/programs/forms/_part.html.erb
- app/views/devise/sessions/new.html.erb 2 additions, 1 deletionapp/views/devise/sessions/new.html.erb
- app/views/server/universities/_form.html.erb 1 addition, 0 deletionsapp/views/server/universities/_form.html.erb
- config/initializers/saml_override.rb 13 additions, 0 deletionsconfig/initializers/saml_override.rb
- config/locales/communication/en.yml 3 additions, 0 deletionsconfig/locales/communication/en.yml
- config/locales/communication/fr.yml 3 additions, 0 deletionsconfig/locales/communication/fr.yml
- config/locales/university/en.yml 2 additions, 0 deletionsconfig/locales/university/en.yml
- config/locales/university/fr.yml 2 additions, 0 deletionsconfig/locales/university/fr.yml
Loading
Please register or sign in to comment