Repository navigation
Tags
Tags
Merge branch 'master' into ben-week-four Conflicts: app/models/post.rb config/routes.rb db/schema.rb spec/features/deleting_a_comment_spec.rb spec/features/viewing_comments_spec.rb
Merge branch 'ben-complete_week_three' Conflicts: app/controllers/comments_controller.rb app/models/comment.rb app/views/comments/edit.html.erb app/views/comments/new.html.erb app/views/comments/show.html.erb app/views/posts/show.html.erb config/routes.rb db/schema.rb spec/factories/comment_factory.rb spec/features/deleting_a_comment_spec.rb spec/features/viewing_comments_spec.rb