snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'main' into stable

Browse Source
This commit is contained in:
Clémentine Urquizar 2021-10-14 13:43:21 +02:00 committed by GitHub
commit b602a0836a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -187,7 +187,7 @@ Search and indexation are the domain of our core engine, [`milli`](https://githu
MeiliSearch collects anonymous data regarding general usage. MeiliSearch collects anonymous data regarding general usage.
This helps us better understand developers' usage of MeiliSearch features. This helps us better understand developers' usage of MeiliSearch features.
To see what information we're retrieving, please see the complete list [on the dedicated issue](https://github.com/meilisearch/MeiliSearch/issues/720). To find out more on what information we're retrieving, please see our documentation on [Telemetry](https://docs.meilisearch.com/learn/what_is_meilisearch/telemetry.html).
This program is optional, you can disable these analytics by using the `MEILI_NO_ANALYTICS` env variable. This program is optional, you can disable these analytics by using the `MEILI_NO_ANALYTICS` env variable.

2
meilisearch-http/src/routes/indexes/documents.rs
View File

@ -181,7 +181,7 @@ async fn document_addition(
vec![ vec![
"application/json".to_string(), "application/json".to_string(),
"application/x-ndjson".to_string(), "application/x-ndjson".to_string(),
"application/csv".to_string(), "text/csv".to_string(),
] ]
}); });
let format = match content_type { let format = match content_type {

4
meilisearch-http/tests/documents/add_documents.rs
View File

@ -124,7 +124,7 @@ async fn add_documents_test_bad_content_types() {
assert_eq!( assert_eq!(
response["message"], response["message"],
json!( json!(
r#"The Content-Type "text/plain" is invalid. Accepted values for the Content-Type header are: "application/json", "application/x-ndjson", "application/csv""# r#"The Content-Type "text/plain" is invalid. Accepted values for the Content-Type header are: "application/json", "application/x-ndjson", "text/csv""#
) )
); );
@ -142,7 +142,7 @@ async fn add_documents_test_bad_content_types() {
assert_eq!( assert_eq!(
response["message"], response["message"],
json!( json!(
r#"The Content-Type "text/plain" is invalid. Accepted values for the Content-Type header are: "application/json", "application/x-ndjson", "application/csv""# r#"The Content-Type "text/plain" is invalid. Accepted values for the Content-Type header are: "application/json", "application/x-ndjson", "text/csv""#
) )
); );
} }