Merge branch 'master' into upgrade/rails-7
No related branches found
No related tags found
Showing
- app/controllers/admin/university/alumni/cohorts_controller.rb 7 additions, 1 deletion...controllers/admin/university/alumni/cohorts_controller.rb
- app/controllers/admin/university/alumni/experiences_controller.rb 6 additions, 1 deletion...rollers/admin/university/alumni/experiences_controller.rb
- app/controllers/users/confirmations_controller.rb 9 additions, 0 deletionsapp/controllers/users/confirmations_controller.rb
- app/helpers/admin/application_helper.rb 3 additions, 2 deletionsapp/helpers/admin/application_helper.rb
- app/models/ability.rb 2 additions, 0 deletionsapp/models/ability.rb
- app/models/communication/website/post.rb 1 addition, 0 deletionsapp/models/communication/website/post.rb
- app/models/communication/website/with_dependencies.rb 4 additions, 5 deletionsapp/models/communication/website/with_dependencies.rb
- app/models/education/diploma.rb 1 addition, 1 deletionapp/models/education/diploma.rb
- app/models/education/program.rb 14 additions, 3 deletionsapp/models/education/program.rb
- app/models/user/with_authentication.rb 11 additions, 3 deletionsapp/models/user/with_authentication.rb
- app/views/admin/layouts/application.html.erb 9 additions, 0 deletionsapp/views/admin/layouts/application.html.erb
- app/views/admin/university/alumni/cohorts/_cohort_fields.html.erb 0 additions, 4 deletions...s/admin/university/alumni/cohorts/_cohort_fields.html.erb
- app/views/admin/university/alumni/experiences/_experience_fields.html.erb 0 additions, 4 deletions...university/alumni/experiences/_experience_fields.html.erb
- app/views/admin/users/show.html.erb 1 addition, 1 deletionapp/views/admin/users/show.html.erb
- config/application.yml.sample 3 additions, 0 deletionsconfig/application.yml.sample
- config/initializers/devise.rb 18 additions, 1 deletionconfig/initializers/devise.rb
- config/locales/en.yml 5 additions, 0 deletionsconfig/locales/en.yml
- config/locales/fr.yml 2 additions, 0 deletionsconfig/locales/fr.yml
- config/routes.rb 2 additions, 0 deletionsconfig/routes.rb
Loading
Please register or sign in to comment