Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec
No related branches found
No related tags found
Showing
- .erdconfig 19 additions, 0 deletions.erdconfig
- Gemfile 14 additions, 1 deletionGemfile
- Gemfile.lock 96 additions, 35 deletionsGemfile.lock
- app/builders/learning_object/draft_builder.rb 7 additions, 10 deletionsapp/builders/learning_object/draft_builder.rb
- app/builders/learning_object_builder.rb 11 additions, 8 deletionsapp/builders/learning_object_builder.rb
- app/controllers/application_controller.rb 14 additions, 12 deletionsapp/controllers/application_controller.rb
- app/controllers/concerns/deleted_objects_controller.rb 14 additions, 0 deletionsapp/controllers/concerns/deleted_objects_controller.rb
- app/controllers/concerns/followable_controller.rb 1 addition, 2 deletionsapp/controllers/concerns/followable_controller.rb
- app/controllers/concerns/highlights_controller.rb 16 additions, 0 deletionsapp/controllers/concerns/highlights_controller.rb
- app/controllers/concerns/resource_model.rb 12 additions, 0 deletionsapp/controllers/concerns/resource_model.rb
- app/controllers/concerns/sociable_controller.rb 9 additions, 1 deletionapp/controllers/concerns/sociable_controller.rb
- app/controllers/concerns/taggable_controller.rb 2 additions, 2 deletionsapp/controllers/concerns/taggable_controller.rb
- app/controllers/old/about_controller.rb 0 additions, 4 deletionsapp/controllers/old/about_controller.rb
- app/controllers/old/bookmarks_controller.rb 0 additions, 46 deletionsapp/controllers/old/bookmarks_controller.rb
- app/controllers/old/callbacks_controller.rb 0 additions, 33 deletionsapp/controllers/old/callbacks_controller.rb
- app/controllers/old/chunks_controller.rb 0 additions, 124 deletionsapp/controllers/old/chunks_controller.rb
- app/controllers/old/collections_controller.rb 0 additions, 229 deletionsapp/controllers/old/collections_controller.rb
- app/controllers/old/complaints_controller.rb 0 additions, 32 deletionsapp/controllers/old/complaints_controller.rb
- app/controllers/old/feedbacks_controller.rb 0 additions, 54 deletionsapp/controllers/old/feedbacks_controller.rb
- app/controllers/old/institutions_controller.rb 0 additions, 83 deletionsapp/controllers/old/institutions_controller.rb
.erdconfig
0 → 100644
... | ... | @@ -47,7 +47,6 @@ gem 'stackprof' |
group :development do | ||
gem 'annotate' | ||
gem 'immigrant' | ||
# Generate ER Diagram from database (use: rake erd) | ||
... | ... | @@ -87,11 +86,17 @@ group :development do |
# JavaScript runtime | ||
gem 'execjs' | ||
# local mailbox | ||
gem 'mailcatcher' | ||
end | ||
group :test do | ||
gem 'shoulda' | ||
gem 'minitest-reporters' | ||
gem 'rspec-rails' | ||
gem 'faker' | ||
gem 'factory_girl_rails' | ||
end | ||
gem 'streamio-ffmpeg', '~> 1.0.0' | ||
... | ... | @@ -147,3 +152,11 @@ gem 'rubyzip' |
# user activity | ||
gem 'public_activity' | ||
gem 'rails-observers' | ||
# soft-deleted for active record models | ||
gem 'paranoia', '~> 2.0' | ||
# models versioning | ||
gem 'paper_trail' | ||
\ No newline at end of file |
app/controllers/concerns/resource_model.rb
0 → 100644
Please register or sign in to comment