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

d4a32187

Commit d4a32187 authored 8 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents c55cd0f5 b91de750

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/collections_controller.rb 3 additions, 1 deletion

app/controllers/v1/collections_controller.rb
app/controllers/v1/learning_objects_controller.rb 3 additions, 1 deletion

app/controllers/v1/learning_objects_controller.rb
app/controllers/v1/search_controller.rb 2 additions, 2 deletions

app/controllers/v1/search_controller.rb
app/models/concerns/thumbnailable.rb 1 addition, 1 deletion

app/models/concerns/thumbnailable.rb
app/models/concerns/trackable.rb 2 additions, 2 deletions

app/models/concerns/trackable.rb
app/services/search_service.rb 1 addition, 3 deletions

app/services/search_service.rb

with 12 additions and 10 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