Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-04-03 09:08:10 -07:00
commit 7a74849bf2

View file

@ -121,7 +121,7 @@ module.exports = class User extends CocoModel
# ... and stopped working well until another update on March 10, so maybe March 11+... # ... and stopped working well until another update on March 10, so maybe March 11+...
# ... and another round, and then basically it just isn't completing well, so we pause the test until we can fix it. # ... and another round, and then basically it just isn't completing well, so we pause the test until we can fix it.
getFourthLevelGroup: -> getFourthLevelGroup: ->
return 'signs-and-portents' return 'forgetful-gemsmith'
return @fourthLevelGroup if @fourthLevelGroup return @fourthLevelGroup if @fourthLevelGroup
group = me.get('testGroupNumber') % 8 group = me.get('testGroupNumber') % 8
@fourthLevelGroup = switch group @fourthLevelGroup = switch group