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

501520ea

Commit 501520ea authored 9 years ago by Matheus Agio Nerone

Downloads
- Plain Diff

fix merge


Signed-off-by: Matheus Agio Nerone <man13@inf.ufpr.br>

parents c4e8fa59 0afe67ec

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/collections_controller.rb 2 additions, 2 deletions

app/controllers/collections_controller.rb
app/controllers/institutions_controller.rb 2 additions, 2 deletions

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

app/controllers/learning_objects_controller.rb
app/controllers/management/highlights_controller.rb 2 additions, 2 deletions

app/controllers/management/highlights_controller.rb
app/controllers/management/users_controller.rb 2 additions, 2 deletions

app/controllers/management/users_controller.rb
app/controllers/welcome_controller.rb 4 additions, 5 deletions

app/controllers/welcome_controller.rb
app/repositories/active_record/carousel_repository.rb 1 addition, 0 deletions

app/repositories/active_record/carousel_repository.rb
app/repositories/active_record/learning_object_repository.rb 2 additions, 2 deletions

app/repositories/active_record/learning_object_repository.rb
app/repositories/active_record/subject_repository.rb 2 additions, 2 deletions

app/repositories/active_record/subject_repository.rb
app/repositories/orient_db/base.rb 4 additions, 4 deletions

app/repositories/orient_db/base.rb
app/repositories/orient_db/main_page_repository.rb 2 additions, 2 deletions

app/repositories/orient_db/main_page_repository.rb
lib/tasks/mainPage.rake 2 additions, 2 deletions

lib/tasks/mainPage.rake
lib/tasks/orientdb.rake 1 addition, 1 deletion

lib/tasks/orientdb.rake

with 28 additions and 28 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