wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-08 04:03:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into base64-secret

Browse Source
This commit is contained in:
Kim Gardner
2018-10-19 18:39:36 +01:00
committed by GitHub
parent fabec2c89b 8c2c632f52
commit 7a5416a807
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.js
+5 -1
View File
@@ -30,7 +30,7 @@ const CONFIG = {
ENABLE_TRACING: Boolean(process.env.APOLLO_ENGINE_KEY),
// EMAIL_SUBJECT_PREFIX is the string before emails in the subject.
EMAIL_SUBJECT_PREFIX: process.env.TALK_EMAIL_SUBJECT_PREFIX || '[Talk]',
EMAIL_SUBJECT_PREFIX: process.env.TALK_EMAIL_SUBJECT_PREFIX,
// DEFAULT_LANG is the default language used for server sent emails and
// rendered text.
@@ -271,6 +271,10 @@ const CONFIG = {
// CONFIG VALIDATION
//==============================================================================
if (typeof CONFIG.EMAIL_SUBJECT_PREFIX === 'undefined') {
CONFIG.EMAIL_SUBJECT_PREFIX = '[Talk]';
}
if (process.env.NODE_ENV === 'test') {
if (!CONFIG.ROOT_URL) {
CONFIG.ROOT_URL = `http://${localAddress}:3001`;