Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

Merge branch 'master' into pre-release-tidy

Browse source
This commit is contained in:
Elliott Stoneham 2016-06-16 18:16:51 +01:00
commit a0f712ca02
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/config/environment.js
View file

@ -35,15 +35,6 @@ module.exports = function(environment) {
} }
}; };
process.argv.forEach(function(element) {
if (element !== undefined) {
if (element.startsWith("intercom=")) {
element = element.replace("intercom=", "");
ENV.APP.intercomKey = element;
}
}
});
if (environment === 'development') { if (environment === 'development') {
ENV.APP.LOG_TRANSITIONS = true; ENV.APP.LOG_TRANSITIONS = true;
ENV.APP.LOG_TRANSITIONS_INTERNAL = true; ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
@ -52,7 +43,6 @@ module.exports = function(environment) {
}; };
ENV.apiHost = "https://localhost:5001"; ENV.apiHost = "https://localhost:5001";
// ENV.apiHost = "https://demo1.dev:5001";
} }
if (environment === 'test') { if (environment === 'test') {
@ -83,6 +73,19 @@ module.exports = function(environment) {
ENV.apiHost = ""; ENV.apiHost = "";
} }
process.argv.forEach(function(element) {
if (element !== undefined) {
if (element.startsWith("intercom=")) {
element = element.replace("intercom=", "");
ENV.APP.intercomKey = element;
}
if (element.startsWith("apiHost=")) {
element = element.replace("apiHost=", "");
ENV.apiHost = element;
}
}
});
ENV.apiNamespace = "api"; ENV.apiNamespace = "api";
ENV.contentSecurityPolicy = null; ENV.contentSecurityPolicy = null;