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

51506483

Commit 51506483 authored 8 years ago by Lucas Ernesto Kindinger

Downloads
- Plain Diff

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

parents 11c39430 8f69ba7f

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 3 additions, 0 deletions

Gemfile
Gemfile.lock 48 additions, 29 deletions

Gemfile.lock
app/controllers/application_controller.rb 5 additions, 13 deletions

app/controllers/application_controller.rb
app/controllers/concerns/taggable_controller.rb 2 additions, 2 deletions

app/controllers/concerns/taggable_controller.rb
app/controllers/v1/search_controller.rb 12 additions, 15 deletions

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

app/models/search.rb
app/services/search_service.rb 7 additions, 1 deletion

app/services/search_service.rb
config/environments/development.rb 4 additions, 0 deletions

config/environments/development.rb
config/routes.rb 5 additions, 2 deletions

config/routes.rb
test/controllers/v1/search_controller_test.rb 9 additions, 12 deletions

test/controllers/v1/search_controller_test.rb

with 96 additions and 75 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