diff --git a/config/environment.js b/config/environment.js index d133112a..ba62ff5e 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,28 +1,5 @@ /* jshint node: true */ -// TODO: how to include this from app/utils/ here? -var extend = function(out) { - out = out || {}; - - for (var i = 1; i < arguments.length; i++) { - var obj = arguments[i]; - - if (!obj) - continue; - - for (var key in obj) { - if (obj.hasOwnProperty(key)) { - if (typeof obj[key] === 'object') - deepExtend(out[key], obj[key]); - else - out[key] = obj[key]; - } - } - } - - return out; -}; - module.exports = function(environment) { var ENV = { modulePrefix: 'travis', @@ -54,11 +31,6 @@ module.exports = function(environment) { intervals: { updateTimes: 1000 } }; - // merge environment vars from index.html - if(typeof TravisENV !== 'undefined') { - extend(ENV, TravisENV); - } - if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; // ENV.APP.LOG_ACTIVE_GENERATION = true;