Merge branch 'master' into feature-tag
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 4 additions, 1 deletion.gitlab-ci.yml
- Gemfile 3 additions, 0 deletionsGemfile
- Gemfile.lock 12 additions, 21 deletionsGemfile.lock
- app/controllers/application_controller.rb 5 additions, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/concerns/paginator.rb 14 additions, 0 deletionsapp/controllers/concerns/paginator.rb
- app/controllers/v1/activities_controller.rb 17 additions, 0 deletionsapp/controllers/v1/activities_controller.rb
- app/controllers/v1/learning_objects_controller.rb 3 additions, 2 deletionsapp/controllers/v1/learning_objects_controller.rb
- app/controllers/v1/reviews_controller.rb 28 additions, 4 deletionsapp/controllers/v1/reviews_controller.rb
- app/controllers/v1/roles_controller.rb 57 additions, 0 deletionsapp/controllers/v1/roles_controller.rb
- app/controllers/v1/search_controller.rb 47 additions, 0 deletionsapp/controllers/v1/search_controller.rb
- app/models/bookmark.rb 2 additions, 0 deletionsapp/models/bookmark.rb
- app/models/collection.rb 1 addition, 0 deletionsapp/models/collection.rb
- app/models/complaint.rb 2 additions, 0 deletionsapp/models/complaint.rb
- app/models/concerns/stateful.rb 6 additions, 6 deletionsapp/models/concerns/stateful.rb
- app/models/concerns/trackable.rb 9 additions, 0 deletionsapp/models/concerns/trackable.rb
- app/models/download.rb 2 additions, 0 deletionsapp/models/download.rb
- app/models/follow.rb 2 additions, 0 deletionsapp/models/follow.rb
- app/models/institution.rb 1 addition, 0 deletionsapp/models/institution.rb
- app/models/learning_object.rb 1 addition, 4 deletionsapp/models/learning_object.rb
- app/models/like.rb 2 additions, 0 deletionsapp/models/like.rb
Loading
Please register or sign in to comment