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

0dc19fe8

Commit 0dc19fe8 authored 9 years ago by Mateus Rambo Strey

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents f0c634f7 8fbdc8c2

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/builders/learning_object_builder.rb 10 additions, 10 deletions

app/builders/learning_object_builder.rb
app/controllers/learning_objects_controller.rb 1 addition, 1 deletion

app/controllers/learning_objects_controller.rb
app/repositories/orient_db/collection_repository.rb 3 additions, 3 deletions

app/repositories/orient_db/collection_repository.rb
app/repositories/orient_db/learning_object_repository.rb 5 additions, 13 deletions

app/repositories/orient_db/learning_object_repository.rb
app/views/welcome/collection.html.erb 0 additions, 73 deletions

app/views/welcome/collection.html.erb
config/initializers/repositories/repositories.rb 8 additions, 4 deletions

config/initializers/repositories/repositories.rb
config/routes.rb 4 additions, 7 deletions

config/routes.rb

with 31 additions and 111 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