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

8f6d1f08

Commit 8f6d1f08 authored 6 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

Merge branch 'teacher-code' into 'master'

Teacher code

See merge request portalmec/portalmec!496

parents e9603994 a4ffbca0

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 21 additions, 38 deletions

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

app/mailers/teacher_mailer.rb
app/policies/user_policy.rb 4 additions, 4 deletions

app/policies/user_policy.rb
app/views/teacher_mailer/new_teacher_received.html.erb 15 additions, 0 deletions

app/views/teacher_mailer/new_teacher_received.html.erb
config/routes.rb 3 additions, 4 deletions

config/routes.rb
spec/acceptance/users_spec.rb 8 additions, 29 deletions

spec/acceptance/users_spec.rb

with 78 additions and 75 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