Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a975e8a1

Commit a975e8a1 authored 6 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'teacher_info' into 'master'

Saving school information on teacher_request and sending email on add_teacher

See merge request portalmec/portalmec!497

parents fd0e7141 ea1df2b1

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/users_controller.rb 27 additions, 7 deletions

app/controllers/v1/users_controller.rb
app/mailers/teacher_mailer.rb 5 additions, 0 deletions

app/mailers/teacher_mailer.rb
app/models/school.rb 8 additions, 0 deletions

app/models/school.rb
app/views/teacher_mailer/new_teacher_approved.html.erb 11 additions, 0 deletions

app/views/teacher_mailer/new_teacher_approved.html.erb
db/migrate/20180905123749_create_schools.rb 14 additions, 0 deletions

db/migrate/20180905123749_create_schools.rb
db/migrate/20180906131310_add_teacher_info_to_user.rb 7 additions, 0 deletions

db/migrate/20180906131310_add_teacher_info_to_user.rb

with 72 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment