Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-06 17:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'devel' into edge

Browse source
This commit is contained in:
Lauri Ojansivu 2019-02-27 06:20:30 +02:00
commit 8d51245161
13 changed files with 50 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/authentication.js
View file

@ -76,8 +76,8 @@ Meteor.startup(() => {
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS || ['openid'],
idTokenWhitelistFields: [],
requestPermissions: ['openid'],
},
}
);

2
server/notifications/email.js
View file

@ -36,7 +36,7 @@ Meteor.startup(() => {
} catch (e) {
return;
}
}, 30000);
}, process.env.EMAIL_NOTIFICATION_TIMEOUT || 30000);
});
});