Merge branch 'master' into 'list'
# Conflicts: # app/controllers/v1/learning_objects_controller.rb
No related branches found
No related tags found
Showing
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 68 additions, 62 deletionsGemfile.lock
- app/builders/learning_object_builder.rb 1 addition, 0 deletionsapp/builders/learning_object_builder.rb
- app/controllers/v1/learning_objects_controller.rb 1 addition, 1 deletionapp/controllers/v1/learning_objects_controller.rb
- app/models/collection_item.rb 8 additions, 0 deletionsapp/models/collection_item.rb
- app/policies/collection_policy.rb 6 additions, 2 deletionsapp/policies/collection_policy.rb
- app/serializers/collection_item_serializer.rb 11 additions, 2 deletionsapp/serializers/collection_item_serializer.rb
- app/serializers/learning_object_serializer.rb 1 addition, 0 deletionsapp/serializers/learning_object_serializer.rb
- app/services/learning_object_publisher.rb 2 additions, 1 deletionapp/services/learning_object_publisher.rb
- app/services/search_service/collection.rb 1 addition, 1 deletionapp/services/search_service/collection.rb
- app/services/search_service/learning_object.rb 1 addition, 1 deletionapp/services/search_service/learning_object.rb
- app/services/search_service/model.rb 17 additions, 13 deletionsapp/services/search_service/model.rb
- app/services/search_service/user.rb 1 addition, 1 deletionapp/services/search_service/user.rb
- config/initializers/elasticsearch.rb 6 additions, 0 deletionsconfig/initializers/elasticsearch.rb
- db/migrate/20170511161146_add_curator_to_learning_object.rb 5 additions, 0 deletionsdb/migrate/20170511161146_add_curator_to_learning_object.rb
Loading
Please register or sign in to comment