Merge branch 'master' into add_cards_to_custom_pages

config/routes/admin.rb

@@ -31,6 +31,7 @@ namespace :admin do
 
   resources :proposals, only: [:index, :show] do
     resources :milestones, controller: "proposal_milestones"
+    resources :progress_bars, except: :show, controller: "proposal_progress_bars"
   end
 
   resources :hidden_proposals, only: :index do
@@ -67,6 +68,7 @@ namespace :admin do
 
     resources :budget_investments, only: [:index, :show, :edit, :update] do
       resources :milestones, controller: 'budget_investment_milestones'
+      resources :progress_bars, except: :show, controller: "budget_investment_progress_bars"
       member { patch :toggle_selection }
     end
 
@@ -203,6 +205,7 @@ namespace :admin do
       end
       resources :draft_versions
       resources :milestones
+      resources :progress_bars, except: :show
       resource :homepage, only: [:edit, :update]
     end
   end