Merge 0fdef06ebf into 137d997793

config/routes.rb

@@ -150,12 +150,17 @@ Osem::Application.routes.draw do
     get '/revision_history/:id/revert_object' => 'versions#revert_object', as: 'revision_history_revert_object'
     get '/revision_history/:id/revert_attribute' => 'versions#revert_attribute', as: 'revision_history_revert_attribute'
   end
+
   resources :organizations, only: [:index] do
     member do
       get :conferences
     end
   end
+
   resources :conferences, only: [:index, :show] do
+    collection do
+      get :user_proposals
+    end
     resources :booths do
       member do
         patch :withdraw