Changeset [b5d0097e4f94f9d5e4b882c783a2d2e8a6cbc8e3] by Graeme Worthy
Revision b5d0097e4f94f9d5e4b882c783a2d2e8a6cbc8e3,
committed by Graeme Worthy
· May 13th, 2009 @ 11:38 PM
Merge branch 'krh-merge'
- krh-merge: some comments controllers, cleaned up all pending specs, and fixed some ratings that weren't allowed on multiple items
Conflicts:
public/stylesheets/greenbuildingmap.css
27 changed files
-
M
app/controllers/application_controller.rb -
M
app/controllers/comments_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/users_controller.rb -
M
app/controllers/versions_controller.rb -
M
app/helpers/comments_helper.rb -
M
app/helpers/items_helper.rb -
M
app/helpers/pages_helper.rb -
M
app/models/rating.rb -
M
app/views/comments/edit.html.erb -
M
app/views/comments/index.html.erb -
M
app/views/comments/new.html.erb -
M
app/views/comments/show.html.erb -
M
app/views/items/_recent_comments.html.erb -
M
app/views/items/_smallmap.html.erb -
M
config/environment.rb -
M
config/environments/development.rb -
M
config/routes.rb -
M
public/stylesheets/greenbuildingmap.css -
M
spec/controllers/comments_controller_spec.rb -
M
spec/controllers/users_controller_spec.rb -
M
spec/controllers/versions_controller_spec.rb -
M
spec/helpers/comments_helper_spec.rb -
M
spec/models/picture_spec.rb -
M
spec/models/rating_spec.rb -
M
spec/views/comments/index.html.erb_spec.rb -
M
spec/views/items/show.html.erb_spec.rb