yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-06 04:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into local-upload-readme

Browse Source
This commit is contained in:
Rémi de Juvigny 2020-08-07 16:03:38 +02:00 committed by GitHub
commit 5fcbcaa2f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/v3.x/plugins/email.md
View File

@ -44,7 +44,7 @@ const emailTemplate = {
Your account is now linked with: <%= user.email %>.`,
html: `<h1>Welcome on mywebsite.fr!</h1>
<p>Your account is now linked with: <%= user.email %>.<p>`,
},
};
await strapi.plugins.email.services.email.sendTemplatedEmail(
{

2
packages/strapi-plugin-graphql/services/build-aggregation.js
View File

@ -212,7 +212,7 @@ const createAggregationFieldsResolver = function(model, fields, operation, typeC
* Correctly format the data returned by the group by
*/
const preProcessGroupByData = function({ result, fieldKey, filters }) {
const _result = _.toArray(result);
const _result = _.toArray(result).filter(value => Boolean(value._id));
return _.map(_result, value => {
return {
key: value._id.toString(),