thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge conflict in tests/index

Browse source
This commit is contained in:
Matthew Dillon 2015-11-13 08:33:04 -07:00
commit 8730b6659f
116 changed files with 1793 additions and 1106 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/environment.js
View file

@ -24,6 +24,15 @@ module.exports = function(environment) {
routeAfterAuthentication: 'protected.compare',
routeIfAlreadyAuthenticated: 'protected.compare',
},
contentSecurityPolicy: {
'default-src': "'none'",
'script-src': "'self'",
'font-src': "'self'",
'connect-src': "'self'",
'img-src': "'self'",
'style-src': "'self' 'unsafe-inline'",
'media-src': "'self'"
}
};
var apiURL;
@ -37,6 +46,8 @@ module.exports = function(environment) {
ENV.APP.LOG_ACTIVE_GENERATION = false;
ENV.APP.LOG_VIEW_LOOKUPS = false;
ENV.locationType = 'none';
ENV.baseURL = '/';
ENV.APP.rootElement = '#ember-testing';
}
if (environment === 'staging') {
@ -50,6 +61,7 @@ module.exports = function(environment) {
}
ENV.apiURL = apiURL;
ENV.contentSecurityPolicy['connect-src'] = `'self' ${apiURL}`;
return ENV;
};