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

9705858a

Commit 9705858a authored 8 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents a84b1af6 1d8fdb3c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/followable_controller.rb 1 addition, 2 deletions

app/controllers/concerns/followable_controller.rb
app/controllers/v1/users_controller.rb 13 additions, 3 deletions

app/controllers/v1/users_controller.rb
app/models/user.rb 19 additions, 0 deletions

app/models/user.rb
app/serializers/follow_serializer.rb 5 additions, 0 deletions

app/serializers/follow_serializer.rb
config/routes.rb 2 additions, 0 deletions

config/routes.rb

with 40 additions and 5 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