gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into remove-angular

Browse Source 
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
This commit is contained in:
Quincy Larson
2015-12-04 18:49:38 -06:00
parent b1d8814aed 887578abb8
commit 7e9d65675a
366 changed files with 12566 additions and 124259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/user.js
View File

@ -322,7 +322,7 @@ module.exports = function(User) {
})
// no results means this is the first brownie point given by giver
// so return -1 to indicate receiver should receive point
.firstOrDefault(null, -1)
.first({ defaultValue: -1 })
.flatMap((browniePointsFromGiver) => {
if (browniePointsFromGiver === -1) {