Merge branch 'master' into populator
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 3 additions, 3 deletions.gitlab-ci.yml
- Gemfile 1 addition, 2 deletionsGemfile
- Gemfile.lock 25 additions, 30 deletionsGemfile.lock
- app/builders/learning_object/draft_builder.rb 0 additions, 33 deletionsapp/builders/learning_object/draft_builder.rb
- app/builders/learning_object_builder.rb 1 addition, 27 deletionsapp/builders/learning_object_builder.rb
- app/controllers/concerns/paginator.rb 2 additions, 1 deletionapp/controllers/concerns/paginator.rb
- app/controllers/v1/collections_controller.rb 24 additions, 14 deletionsapp/controllers/v1/collections_controller.rb
- app/controllers/v1/complaints_controller.rb 5 additions, 5 deletionsapp/controllers/v1/complaints_controller.rb
- app/controllers/v1/educational_stages_controller.rb 10 additions, 0 deletionsapp/controllers/v1/educational_stages_controller.rb
- app/controllers/v1/feed_controller.rb 31 additions, 0 deletionsapp/controllers/v1/feed_controller.rb
- app/controllers/v1/learning_objects/attachment_controller.rb 36 additions, 0 deletionsapp/controllers/v1/learning_objects/attachment_controller.rb
- app/controllers/v1/learning_objects/chunks_controller.rb 84 additions, 22 deletionsapp/controllers/v1/learning_objects/chunks_controller.rb
- app/controllers/v1/learning_objects/publishes_controller.rb 30 additions, 0 deletionsapp/controllers/v1/learning_objects/publishes_controller.rb
- app/controllers/v1/learning_objects/uploads_controller.rb 1 addition, 1 deletionapp/controllers/v1/learning_objects/uploads_controller.rb
- app/controllers/v1/learning_objects_controller.rb 27 additions, 11 deletionsapp/controllers/v1/learning_objects_controller.rb
- app/controllers/v1/reviews_controller.rb 2 additions, 2 deletionsapp/controllers/v1/reviews_controller.rb
- app/controllers/v1/search_controller.rb 3 additions, 1 deletionapp/controllers/v1/search_controller.rb
- app/controllers/v1/subjects_controller.rb 10 additions, 0 deletionsapp/controllers/v1/subjects_controller.rb
- app/models/collection.rb 10 additions, 0 deletionsapp/models/collection.rb
- app/models/complaint.rb 5 additions, 5 deletionsapp/models/complaint.rb
Loading
Please register or sign in to comment