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

c997309a

Commit c997309a authored 6 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

Merge branch 'teacher-code' into 'master'

Teacher's validation

See merge request portalmec/portalmec!494

parents 477eecae 4ae01440

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/application_controller.rb 1 addition, 1 deletion

app/controllers/application_controller.rb
app/controllers/v1/users_controller.rb 3 additions, 2 deletions

app/controllers/v1/users_controller.rb
app/models/role.rb 4 additions, 0 deletions

app/models/role.rb
app/models/user.rb 19 additions, 0 deletions

app/models/user.rb
app/serializers/user_devise_serializer.rb 1 addition, 1 deletion

app/serializers/user_devise_serializer.rb
app/serializers/user_serializer.rb 6 additions, 0 deletions

app/serializers/user_serializer.rb
db/migrate/20180627133142_add_teacher_id_to_users.rb 5 additions, 0 deletions

db/migrate/20180627133142_add_teacher_id_to_users.rb
db/migrate/20180704145600_add_birthday_to_users.rb 5 additions, 0 deletions

db/migrate/20180704145600_add_birthday_to_users.rb

with 44 additions and 4 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