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

491deed4

Commit 491deed4 authored 6 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into issue/388

parents b9d449b3 d0e27cfe

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/learning_objects_controller.rb 1 addition, 1 deletion

app/controllers/v1/learning_objects_controller.rb
app/models/learning_object.rb 2 additions, 2 deletions

app/models/learning_object.rb
app/models/review.rb 5 additions, 1 deletion

app/models/review.rb
app/serializers/learning_object_serializer.rb 1 addition, 1 deletion

app/serializers/learning_object_serializer.rb
db/migrate/20190227115926_create_join_table_language_learning_object.rb 17 additions, 0 deletions

...90227115926_create_join_table_language_learning_object.rb
lib/tasks/language.rake 5 additions, 1 deletion

lib/tasks/language.rake
spec/acceptance/learning_objects_spec.rb 3 additions, 3 deletions

spec/acceptance/learning_objects_spec.rb
spec/factories/learning_objects.rb 1 addition, 1 deletion

spec/factories/learning_objects.rb
test/fixtures/learning_objects.yml 0 additions, 1 deletion

test/fixtures/learning_objects.yml
test/models/learning_object_test.rb 1 addition, 2 deletions

test/models/learning_object_test.rb

with 36 additions and 13 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