Merge branch 'master' into develop

packages/create-strapi-app/README.md

@@ -9,13 +9,13 @@ This package includes the `create-strapi-app` CLI to make the creation of a stra
 Using yarn create command
 
 ```
-yarn create strapi-app my-app
+yarn create strapi-app my-project
 ```
 
 Using npx
 
 ```
-npx create-strapi-app my-app
+npx create-strapi-app my-project
 ```
 
 ### Manual install

packages/strapi-admin/admin/src/containers/HomePage/index.js

@@ -107,7 +107,7 @@ const SOCIAL_LINKS = [
   },
   {
     name: 'Reddit',
-    link: 'https://www.reddit.com/r/node/search?q=strapi',
+    link: 'https://www.reddit.com/r/Strapi/',
   },
   {
     name: 'Stack Overflow',

packages/strapi-hook-knex/lib/index.js

@@ -115,7 +115,7 @@ module.exports = strapi => {
                 charset: _.get(connection.settings, 'charset'),
                 schema: _.get(connection.settings, 'schema', 'public'),
                 port: _.get(connection.settings, 'port'),
-                socket: _.get(connection.settings, 'socketPath'),
+                socketPath: _.get(connection.settings, 'socketPath'),
                 ssl: _.get(connection.settings, 'ssl', false),
                 timezone: _.get(connection.settings, 'timezone', 'utc'),
                 filename: _.get(

packages/strapi-plugin-documentation/README.md

@@ -17,7 +17,7 @@ The documentation plugin is not release on npm yet, Here's how to install it.
 
 ### Config
 
-The plugin comes with a `settings.json` file located in `my-app/plugins/documentation/config` folder where you can specify all your environment variables, licenses, external documentation and so one...
+The plugin comes with a `settings.json` file located in `./my-project/plugins/documentation/config` folder where you can specify all your environment variables, licenses, external documentation and so one...
 You can add all the entries listed in the [specification](https://swagger.io/specification/).
 
 _NOTE_ if you need to add a custom key you can do it by prefixing your key by `x-{something}`

packages/strapi-plugin-users-permissions/controllers/Auth.js

@@ -67,7 +67,7 @@ module.exports = {
       // Check if the user exists.
       const user = await strapi
         .query('user', 'users-permissions')
-        .findOne(query, ['role']);
+        .findOne(query);
 
       if (!user) {
         return ctx.badRequest(