Upstream sync

config/routes.rb

@@ -31,6 +31,7 @@ Rails.application.routes.draw do
       resources :users, only: [:index, :new, :create, :edit, :update, :destroy] do
         resource :masquerade, only: :create
       end
+      resources :task_requests, only: [:index, :edit, :update, :show]
 
       root to: "accounts#index", as: :signed_in_root
     end
@@ -99,6 +100,12 @@ Rails.application.routes.draw do
           delete :destroy_file
         end
       end
+      resources :task_requests, except: :destroy do
+        member do
+          post :cancel
+        end
+      end
+      resources :tasks, only: :index
     end
     resource :profile, only: [:show, :update]
     resources :videos, only: [] do