Marcin Kulik 61b3890a3d Merge remote-tracking branch 'origin/unique-nickname' ... * origin/unique-nickname: Keep sensitive signup data in session Add users factory back rm users factories Add view spec for users#new Add specs to user#create Validate nickname uniquness Conflicts: Gemfile Gemfile.lock		2012-03-10 18:30:33 +01:00
..
assets	Display asciicast example on homepage	2012-03-10 17:57:35 +01:00
controllers	Merge remote-tracking branch 'origin/unique-nickname'	2012-03-10 18:30:33 +01:00
helpers	Random description for asciicast	2012-03-10 14:56:43 +01:00
mailers	Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7	2011-11-21 22:36:42 +01:00
models	Merge remote-tracking branch 'origin/unique-nickname'	2012-03-10 18:30:33 +01:00
uploaders	Check code style with cane and tailor	2012-03-08 15:00:10 +01:00
views	Merge remote-tracking branch 'origin/unique-nickname'	2012-03-10 18:30:33 +01:00