Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-01-31 16:59:19 -08:00
commit 068e6a901a

View file

@ -125,6 +125,7 @@ module.exports = class User extends CocoModel
getForeshadowsLevels: -> getForeshadowsLevels: ->
return @foreshadowsLevels if @foreshadowsLevels? return @foreshadowsLevels if @foreshadowsLevels?
return false # bad performance problems, reenable later
group = me.get('testGroupNumber') % 16 group = me.get('testGroupNumber') % 16
@foreshadowsLevels = switch group @foreshadowsLevels = switch group
when 0, 1, 2, 3, 4, 5, 6, 7 then true when 0, 1, 2, 3, 4, 5, 6, 7 then true