Merge branch 'feature-tags'
Showing
- Gemfile 0 additions, 2 deletionsGemfile
- app/controllers/concerns/taggable_controller.rb 47 additions, 0 deletionsapp/controllers/concerns/taggable_controller.rb
- app/controllers/v1/collections_controller.rb 7 additions, 3 deletionsapp/controllers/v1/collections_controller.rb
- app/controllers/v1/learning_objects_controller.rb 6 additions, 1 deletionapp/controllers/v1/learning_objects_controller.rb
- app/models/collection.rb 7 additions, 8 deletionsapp/models/collection.rb
- app/models/concerns/taggable.rb 10 additions, 0 deletionsapp/models/concerns/taggable.rb
- app/models/concerns/tagger.rb 32 additions, 0 deletionsapp/models/concerns/tagger.rb
- app/models/institution.rb 2 additions, 0 deletionsapp/models/institution.rb
- app/models/learning_object.rb 2 additions, 3 deletionsapp/models/learning_object.rb
- app/models/tag.rb 7 additions, 0 deletionsapp/models/tag.rb
- app/models/tagging.rb 9 additions, 0 deletionsapp/models/tagging.rb
- app/models/user.rb 10 additions, 8 deletionsapp/models/user.rb
- app/policies/collection_policy.rb 2 additions, 0 deletionsapp/policies/collection_policy.rb
- app/policies/learning_object_policy.rb 1 addition, 0 deletionsapp/policies/learning_object_policy.rb
- app/policies/taggable_policy.rb 10 additions, 0 deletionsapp/policies/taggable_policy.rb
- app/serializers/collection_serializer.rb 2 additions, 1 deletionapp/serializers/collection_serializer.rb
- app/serializers/learning_object_serializer.rb 1 addition, 1 deletionapp/serializers/learning_object_serializer.rb
- app/services/tags_importer.rb 31 additions, 3 deletionsapp/services/tags_importer.rb
- config/routes.rb 9 additions, 2 deletionsconfig/routes.rb
- db/migrate/20160413123458_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb 0 additions, 31 deletions...ts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
Loading
Please register or sign in to comment