Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' into plan_comment
Add new model (comment model)
Merge remote-tracking branch 'origin/plan_comment' into plan_comment
Delete comment model
Add field :writer on opinion model
Merge remote-tracking branch 'origin/plan_comment' into plan_comment
Add comment form

Modified:   controllers/plans_controller.rb
Modified:   views/plans/show.html.haml
Stop to recycle, Opinion model

Modified:   models/opinion.rb
Modified:   models/plan.rb
Fix review form

Modified:   views/plans/show.html.haml
Add comment model
Create dependency
Remove no need line.
Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' into plan_comment
部分テンプレート(renderのやつ)を使うように変更した

New file:   app/views/plans/_comment_list.html.haml
Modified:   app/views/plans/show.html.haml
Merge remote-tracking branch 'origin/plan_comment' into plan_comment
routesも設定して、controllerにもadd_commentメソッドを記述した

しかし、POST /plans/:id/add_commentの指定方法がわからない。
Modified:   app/controllers/plans_controller.rb
Modified:   app/views/plans/_comment_list.html.haml
Modified:   app/views/plans/show.html.haml
Modified:   config/routes.rb
merge by manually