Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Fixes #6935 - Let Bluebird know Promise is not runaway

Browse source
This commit is contained in:
Ethan Garofolo 2016-06-07 09:04:18 -06:00
parent db3df16c21
commit b3c88b8c14
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/server/config/index.js
View file

@ -255,8 +255,9 @@ ConfigManager.prototype.load = function (configFilePath) {
Promise.resolve(pendingConfig).then(function () { Promise.resolve(pendingConfig).then(function () {
return self.validate(); return self.validate();
}).then(function (rawConfig) { }).then(function (rawConfig) {
resolve(self.init(rawConfig)); return self.init(rawConfig);
}).catch(reject); }).then(resolve)
.catch(reject);
}); });
}); });
}; };