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

c48619b2

Commit c48619b2 authored 6 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'elastic-6' into 'master'

Updated search code to work with Elasticsearch 6.2.4

See merge request portalmec/portalmec!506

parents 7448f782 51abe296

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 19 additions, 18 deletions

Gemfile.lock
app/models/collection.rb 9 additions, 1 deletion

app/models/collection.rb
app/models/learning_object.rb 10 additions, 1 deletion

app/models/learning_object.rb
app/serializers/learning_object_serializer.rb 1 addition, 0 deletions

app/serializers/learning_object_serializer.rb
app/services/search_service/collection.rb 6 additions, 6 deletions

app/services/search_service/collection.rb
app/services/search_service/learning_object.rb 7 additions, 7 deletions

app/services/search_service/learning_object.rb
app/services/search_service/model.rb 1 addition, 1 deletion

app/services/search_service/model.rb
app/services/search_service/user.rb 1 addition, 1 deletion

app/services/search_service/user.rb

with 54 additions and 35 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