Merge branch 'master' into notifications

2016-01-08 15:07:16 +01:00
parent 3fa8ab18c6 2f6aa834d1
commit 307b29736d
13 changed files with 100 additions and 32 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -53,7 +53,7 @@ Rails.application.routes.draw do
    end
  end

-  resources :comments, only: :create, shallow: true do
+  resources :comments, only: [:create, :show], shallow: true do
    member do
      post :vote
      put :flag