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

ccfff5e8

Commit ccfff5e8 authored 8 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into filter_activity

parents 9daef03e 60ed315d

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 0 deletions

Gemfile
app/controllers/v1/collections_controller.rb 2 additions, 2 deletions

app/controllers/v1/collections_controller.rb
app/models/collection.rb 6 additions, 10 deletions

app/models/collection.rb
app/models/collection_item.rb 1 addition, 1 deletion

app/models/collection_item.rb
app/models/learning_object.rb 1 addition, 1 deletion

app/models/learning_object.rb
app/models/like.rb 1 addition, 1 deletion

app/models/like.rb
app/serializers/collection_item_serializer.rb 6 additions, 1 deletion

app/serializers/collection_item_serializer.rb
app/serializers/collection_min_serializer.rb 7 additions, 0 deletions

app/serializers/collection_min_serializer.rb
app/serializers/collection_serializer.rb 1 addition, 1 deletion

app/serializers/collection_serializer.rb
app/serializers/user_serializer.rb 1 addition, 3 deletions

app/serializers/user_serializer.rb
db/migrate/20161125134057_add_counts_to_user.rb 7 additions, 0 deletions

db/migrate/20161125134057_add_counts_to_user.rb
db/migrate/20161125153200_add_review_average_to_collection.rb 5 additions, 0 deletions

...igrate/20161125153200_add_review_average_to_collection.rb
db/migrate/20161128122731_change_collection_item_column_name.rb 5 additions, 0 deletions

...rate/20161128122731_change_collection_item_column_name.rb

with 45 additions and 20 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