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

ba78624d

Commit ba78624d authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 76ea90e1 0dcd8e96

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application/search.js 294 additions, 148 deletions

app/assets/javascripts/application/search.js
app/assets/stylesheets/application/search.scss 11 additions, 0 deletions

app/assets/stylesheets/application/search.scss
app/controllers/search_controller.rb 0 additions, 7 deletions

app/controllers/search_controller.rb
app/views/search/index.html.erb 24 additions, 14 deletions

app/views/search/index.html.erb

with 329 additions and 169 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