Merge branch 'master' into community

2017-09-05 15:40:03 +02:00
parent da7b53acf4 c0238c9265
commit 6f9d48f0eb
31 changed files with 436 additions and 202 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -286,7 +286,10 @@ Rails.application.routes.draw do
        get :search, on: :collection
      end

-      resources :booths
+      resources :booths do
+        resources :shifts
+      end
+
      resources :questions
    end