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

9a2fe8af

Commit 9a2fe8af authored 8 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

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

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-collection_item_serializer

parents d10d1b5a badacd18

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/v1/activities_controller.rb 2 additions, 2 deletions

app/controllers/v1/activities_controller.rb
app/controllers/v1/feed_controller.rb 1 addition, 1 deletion

app/controllers/v1/feed_controller.rb
app/models/concerns/trackable.rb 2 additions, 0 deletions

app/models/concerns/trackable.rb
app/models/learning_object.rb 1 addition, 1 deletion

app/models/learning_object.rb
app/models/user.rb 2 additions, 3 deletions

app/models/user.rb
app/policies/activity_policy.rb 3 additions, 1 deletion

app/policies/activity_policy.rb
app/serializers/learning_object_serializer.rb 2 additions, 2 deletions

app/serializers/learning_object_serializer.rb
app/services/activities_filter_service.rb 22 additions, 0 deletions

app/services/activities_filter_service.rb

with 35 additions and 10 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