Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

Elasticsearch DSL
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

9b023dc9

Unverified Commit 9b023dc9 authored 5 years ago by Simonas Šerlinskas

Downloads
- Plain Diff

Merge branch '5.x' into 6.x

# Conflicts:
#	composer.json

parents e4321032 093bf045

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

docs/Query/Compound/FunctionScore.md 1 addition, 1 deletion

docs/Query/Compound/FunctionScore.md
src/Query/Compound/FunctionScoreQuery.php 7 additions, 4 deletions

src/Query/Compound/FunctionScoreQuery.php
src/Search.php 2 additions, 2 deletions

src/Search.php
src/SearchEndpoint/SearchEndpointInterface.php 2 additions, 1 deletion

src/SearchEndpoint/SearchEndpointInterface.php

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