Changeset [69c7032e91e36106d67934dae12a65184ac2f02f] by Graeme Worthy
Revision 69c7032e91e36106d67934dae12a65184ac2f02f,
committed by Graeme Worthy
· May 13th, 2009 @ 11:47 PM
Merge branch 'userpages'
- userpages: uesr pages are for awesome 'added tests for logged-inness and therefore the dashboard'
Conflicts:
app/controllers/items_controller.rb
5 changed files
-
M
app/controllers/items_controller.rb -
M
app/controllers/users_controller.rb -
M
app/views/items/index.html.erb -
M
db/schema.rb -
M
spec/controllers/homepage_controller_spec.rb