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

981a55f7

Commit 981a55f7 authored 8 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 5d2ff7bb 2ffdede9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/builders/learning_object/draft_builder.rb 6 additions, 9 deletions

app/builders/learning_object/draft_builder.rb
app/builders/learning_object_builder.rb 11 additions, 8 deletions

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

app/controllers/v1/learning_objects_controller.rb
app/models/concerns/metadatable.rb 3 additions, 11 deletions

app/models/concerns/metadatable.rb
app/models/concerns/taggable.rb 0 additions, 2 deletions

app/models/concerns/taggable.rb
app/serializers/learning_object_obaa_serializer.rb 64 additions, 0 deletions

app/serializers/learning_object_obaa_serializer.rb
app/serializers/learning_object_serializer.rb 10 additions, 1 deletion

app/serializers/learning_object_serializer.rb
test/fixtures/learning_objects.yml 2 additions, 2 deletions

test/fixtures/learning_objects.yml

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