From 443afdc4125cd1c1ea5cd7d9bb55d25e699a2a66 Mon Sep 17 00:00:00 2001 From: maryamsulemani97 <90181761+maryamsulemani97@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:37:19 +0400 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a25dd0023..31f8c773b 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Search and indexation are the domain of our core engine, [`milli`](https://githu MeiliSearch collects anonymous data regarding general usage. 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. From 1fa3aeceebb4b2f7ef78eae211264c051a3035a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= Date: Tue, 12 Oct 2021 13:47:38 +0200 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31f8c773b..883084b90 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Search and indexation are the domain of our core engine, [`milli`](https://githu MeiliSearch collects anonymous data regarding general usage. This helps us better understand developers' usage of MeiliSearch features. -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). +The exhaustive list of the information we're retrieving is available on the [Telemetry page](https://docs.meilisearch.com/learn/what_is_meilisearch/telemetry.html) in our documentation. This program is optional, you can disable these analytics by using the `MEILI_NO_ANALYTICS` env variable. From f09016b2bcd7877b8696beea17913a82c6bb99f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= Date: Tue, 12 Oct 2021 13:49:31 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 883084b90..31f8c773b 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Search and indexation are the domain of our core engine, [`milli`](https://githu MeiliSearch collects anonymous data regarding general usage. This helps us better understand developers' usage of MeiliSearch features. -The exhaustive list of the information we're retrieving is available on the [Telemetry page](https://docs.meilisearch.com/learn/what_is_meilisearch/telemetry.html) in our documentation. +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. From c9e1d054c7af01910ad4b6851828314186c4e4df Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Tue, 12 Oct 2021 13:38:48 -0400 Subject: [PATCH 4/4] Fix csv content-type error --- meilisearch-http/src/routes/indexes/documents.rs | 2 +- meilisearch-http/tests/documents/add_documents.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meilisearch-http/src/routes/indexes/documents.rs b/meilisearch-http/src/routes/indexes/documents.rs index e890bab24..2f6746c90 100644 --- a/meilisearch-http/src/routes/indexes/documents.rs +++ b/meilisearch-http/src/routes/indexes/documents.rs @@ -181,7 +181,7 @@ async fn document_addition( vec![ "application/json".to_string(), "application/x-ndjson".to_string(), - "application/csv".to_string(), + "text/csv".to_string(), ] }); let format = match content_type { diff --git a/meilisearch-http/tests/documents/add_documents.rs b/meilisearch-http/tests/documents/add_documents.rs index a9189a30c..15f81b5f3 100644 --- a/meilisearch-http/tests/documents/add_documents.rs +++ b/meilisearch-http/tests/documents/add_documents.rs @@ -124,7 +124,7 @@ async fn add_documents_test_bad_content_types() { assert_eq!( response["message"], 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!( response["message"], 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""# ) ); }