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

634eaac2

Commit 634eaac2 authored 8 years ago by bfs15

Downloads
- Plain Diff

Merge branch 'master' into 212-user-update-policy-role-ids

parents 255c88aa 6e922079

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

app/controllers/v1/users_controller.rb
app/models/user.rb 1 addition, 0 deletions

app/models/user.rb
app/serializers/user_serializer.rb 2 additions, 1 deletion

app/serializers/user_serializer.rb
db/migrate/20170307133405_add_education_to_users.rb 5 additions, 0 deletions

db/migrate/20170307133405_add_education_to_users.rb

with 30 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