Merge pull request #665 from codydaig/mergeissue

change _.extend to _.merge
meanjs · Jul 20, 2015 · 53194ff · 53194ff
2 parents 09251d1 + 4d1ae6e
commit 53194ff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/config/config.js b/config/config.js
@@ -147,7 +147,7 @@ var initGlobalConfig = function() {
 	var environmentAssets = require(path.join(process.cwd(), 'config/assets/', process.env.NODE_ENV)) || {};
 
 	// Merge assets
-	var assets = _.extend(defaultAssets, environmentAssets);
+	var assets = _.merge(defaultAssets, environmentAssets);
 
     // Get the default config
     var defaultConfig = require(path.join(process.cwd(), 'config/env/default'));
@@ -156,7 +156,7 @@ var initGlobalConfig = function() {
     var environmentConfig = require(path.join(process.cwd(), 'config/env/', process.env.NODE_ENV)) || {};
 
     // Merge config files
-    var envConf = _.extend(defaultConfig, environmentConfig);
+    var envConf = _.merge(defaultConfig, environmentConfig);
 
    var config = _.merge(envConf, (fs.existsSync(path.join(process.cwd(), 'config/env/local.js')) && require(path.join(process.cwd(), 'config/env/local.js'))) || {});