4 commits

Author	SHA1	Message	Date
Maxwell Salzberg	b124d3e5a1	Revert "update factory girl" new version does not support 1.8.7 :( ... This reverts commit c52342b7cb.	2012-05-16 17:43:56 -07:00
Maxwell Salzberg	c52342b7cb	update factory girl	2012-05-16 17:17:14 -07:00
Maxwell Salzberg	a36d5558db	use merge not merge! so we dont create false user objects	2012-04-05 11:42:32 -07:00
Dennis Collinson	558ceec92a	a user can mark themselves as nsfw	2012-02-07 19:03:20 -08:00