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

fd8e0de7

Commit fd8e0de7 authored 8 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'feature-highlights'

parents b16d1d51 0cc77c1c

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/highlights_controller.rb 16 additions, 0 deletions

app/controllers/concerns/highlights_controller.rb
app/controllers/concerns/sociable_controller.rb 4 additions, 0 deletions

app/controllers/concerns/sociable_controller.rb
app/controllers/v1/collections_controller.rb 6 additions, 14 deletions

app/controllers/v1/collections_controller.rb
app/controllers/v1/learning_objects_controller.rb 5 additions, 11 deletions

app/controllers/v1/learning_objects_controller.rb
app/controllers/v1/reviews_controller.rb 2 additions, 3 deletions

app/controllers/v1/reviews_controller.rb
app/controllers/v1/users_controller.rb 1 addition, 4 deletions

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

app/models/collection.rb
app/models/concerns/highlights.rb 9 additions, 0 deletions

app/models/concerns/highlights.rb
app/models/learning_object.rb 3 additions, 1 deletion

app/models/learning_object.rb
config/routes.rb 9 additions, 2 deletions

config/routes.rb
test/models/collection_test.rb 8 additions, 0 deletions

test/models/collection_test.rb
test/models/learning_object_test.rb 23 additions, 0 deletions

test/models/learning_object_test.rb

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