Merge branch 'master' into chore/admin-development

README.md

@@ -107,22 +107,6 @@ This project is currently in **Beta**. Significant breaking changes are unlikely
 
 **[See more on our website](https://strapi.io/overview)**.
 
-### Try on Heroku
-
-You can also give it a try using Heroku in one click!
-
-<a href="https://heroku.com/deploy?template=https://github.com/strapi/strapi-heroku-app">
-  <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
-</a>
-
-Be aware that the Content Type Builder won't work due to the restriction of writing files on the Heroku servers. If you would like to change/edit/add Content Types, you need to follow these steps:
-
-1. Click the button above and deploy your app
-2. Clone that repo by using `heroku git:clone -a` followed by your repo's name
-3. Go into the cloned projects' folder using `cd` followed by your repo's name
-4. Add the Heroku boilerplate as a remote by running `git remote add boilerplate https://github.com/strapi/strapi-heroku-app`
-5. Pull from this new origin by running `git pull boilerplate master`
-
 ## Contributing
 
 Please read our [Contributing Guide](./CONTRIBUTING.md) before submitting a Pull Request to the project.

docs/3.0.0-beta.x/guides/graphql.md

@@ -29,7 +29,7 @@ npm run strapi install graphql
 ::: tab "strapi" id="strapi"
 
 ```
-strapi install documentation
+strapi install graphql
 ```
 
 :::

packages/strapi-hook-bookshelf/lib/queries.js

@@ -547,7 +547,7 @@ const buildSearchQuery = (qb, model, params) => {
       const searchQuery = searchText.map(attribute =>
         _.toLower(attribute) === attribute
           ? `to_tsvector(${attribute})`
-          : `to_tsvector('${attribute}')`
+          : `to_tsvector("${attribute}")`
       );
 
       qb.orWhereRaw(`${searchQuery.join(' || ')} @@ plainto_tsquery(?)`, query);

packages/strapi-provider-upload-aws-s3/README.md

@@ -1,4 +1,4 @@
-# strapi-provider-upload-local
+# strapi-provider-upload-s3
 
 ## Resources