Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f54da69e

Commit f54da69e authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

Merge branch 'fix-activerecord-migration' of...

Merge branch 'fix-activerecord-migration' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-activerecord-migration

parents 21b99ce0 94c46a54

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/chunks_controller.rb 1 addition, 1 deletion

app/controllers/chunks_controller.rb
app/controllers/collections_controller.rb 4 additions, 4 deletions

app/controllers/collections_controller.rb
app/controllers/concerns/reportable.rb 1 addition, 1 deletion

app/controllers/concerns/reportable.rb
app/controllers/institutions_controller.rb 4 additions, 4 deletions

app/controllers/institutions_controller.rb
app/controllers/learning_objects_controller.rb 6 additions, 6 deletions

app/controllers/learning_objects_controller.rb
app/controllers/subjects_controller.rb 0 additions, 26 deletions

app/controllers/subjects_controller.rb
app/controllers/users_controller.rb 1 addition, 1 deletion

app/controllers/users_controller.rb
app/models/language.rb 2 additions, 4 deletions

app/models/language.rb
app/models/learning_object.rb 6 additions, 0 deletions

app/models/learning_object.rb
app/models/user.rb 1 addition, 1 deletion

app/models/user.rb
app/workers/convert_video_worker.rb 1 addition, 1 deletion

app/workers/convert_video_worker.rb
app/workers/create_relations_worker.rb 5 additions, 5 deletions

app/workers/create_relations_worker.rb
app/workers/import_learning_object_worker.rb 1 addition, 1 deletion

app/workers/import_learning_object_worker.rb
app/workers/score_calculator_worker.rb 8 additions, 8 deletions

app/workers/score_calculator_worker.rb

with 41 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment