Merge branch 'master' into question-answer-documents

2017-10-06 13:55:49 +02:00
parent b4d494ce24 c2edb58679
commit de9b599578
22 changed files with 285 additions and 13 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -303,6 +303,7 @@ Rails.application.routes.draw do
      resources :questions do
        resources :answers, only: [:new, :create, :update], controller: 'questions/answers', shallow: true do
          resources :images, controller: 'questions/answers/images'
+          resources :videos, controller: 'questions/answers/videos'
          get :documents, to: 'questions/answers#documents'
        end
      end