Merge branch 'activerecord-migration' of...
Merge branch 'activerecord-migration' of gitlab.c3sl.ufpr.br:portalmec/portalmec into activerecord-migration
No related branches found
No related tags found
Showing
- Gemfile 4 additions, 1 deletionGemfile
- Gemfile.lock 74 additions, 72 deletionsGemfile.lock
- app/assets/javascripts/application/autocomplete.js 1 addition, 1 deletionapp/assets/javascripts/application/autocomplete.js
- app/assets/stylesheets/application.scss 1 addition, 0 deletionsapp/assets/stylesheets/application.scss
- app/controllers/collections_controller.rb 15 additions, 21 deletionsapp/controllers/collections_controller.rb
- app/controllers/search_controller.rb 41 additions, 33 deletionsapp/controllers/search_controller.rb
- app/models/collection.rb 5 additions, 1 deletionapp/models/collection.rb
- app/models/collection_item.rb 2 additions, 0 deletionsapp/models/collection_item.rb
- app/models/concerns/metadatable.rb 2 additions, 2 deletionsapp/models/concerns/metadatable.rb
- app/models/learning_object.rb 15 additions, 0 deletionsapp/models/learning_object.rb
- app/models/topic.rb 7 additions, 0 deletionsapp/models/topic.rb
- app/views/learning_objects/show.html.erb 1 addition, 1 deletionapp/views/learning_objects/show.html.erb
- app/views/search/_fetch.html.erb 1 addition, 1 deletionapp/views/search/_fetch.html.erb
- app/views/search/index.html.erb 2 additions, 2 deletionsapp/views/search/index.html.erb
- db/migrate/20160125120915_create_learning_objects.rb 2 additions, 2 deletionsdb/migrate/20160125120915_create_learning_objects.rb
- db/migrate/20160125123423_create_collections.rb 1 addition, 1 deletiondb/migrate/20160125123423_create_collections.rb
- vendor/assets/stylesheets/spinners.css 0 additions, 3108 deletionsvendor/assets/stylesheets/spinners.css
Loading
Please register or sign in to comment