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

5285fd45

Commit 5285fd45 authored 5 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'issue/401' into 'master'

Issue/401

See merge request portalmec/portalmec!535

parents ebd26f74 985a2132

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/users_controller.rb 2 additions, 1 deletion

app/controllers/v1/users_controller.rb
app/serializers/user_devise_serializer.rb 1 addition, 1 deletion

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

app/serializers/user_serializer.rb
db/migrate/20190509134707_add_ask_teacher_question_to_user.rb 5 additions, 0 deletions

...igrate/20190509134707_add_ask_teacher_question_to_user.rb
spec/acceptance/users_spec.rb 2 additions, 0 deletions

spec/acceptance/users_spec.rb

with 13 additions and 2 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