Merge branch 'master' into aperez-admin-question-videos

2017-10-06 01:12:22 +02:00
parent 5862eea516 806fd85246
commit c72f95c72b
42 changed files with 460 additions and 277 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -301,7 +301,8 @@ Rails.application.routes.draw do
      end

      resources :questions, shallow: true do
-        resources :answers, only: [:new, :create], controller: 'questions/answers' do
+        resources :answers, only: [:new, :create], controller: 'questions/answers', shallow: true do
+          resources :images, controller: 'questions/answers/images'
          resources :videos, controller: 'questions/answers/videos'
        end
      end