Merge branch 'master' into polls
This commit is contained in:
@@ -329,7 +329,7 @@ Rails.application.routes.draw do
|
||||
get :support_investments
|
||||
get :print_investments
|
||||
end
|
||||
resources :investments, only: [:index, :new, :create, :show], controller: 'budgets/investments' do
|
||||
resources :investments, only: [:index, :new, :create, :show, :destroy], controller: 'budgets/investments' do
|
||||
post :vote, on: :member
|
||||
get :print, on: :collection
|
||||
end
|
||||
@@ -355,6 +355,15 @@ Rails.application.routes.draw do
|
||||
|
||||
mount Tolk::Engine => '/translate', :as => 'tolk'
|
||||
|
||||
# more info pages
|
||||
get 'more-information', to: 'pages#show', id: 'more_info/index', as: 'more_info'
|
||||
get 'more-information/how-to-use', to: 'pages#show', id: 'more_info/how_to_use/index', as: 'how_to_use'
|
||||
get 'more-information/faq', to: 'pages#show', id: 'more_info/faq/index', as: 'faq'
|
||||
get 'more-information/proposals', to: 'pages#show', id: 'more_info/proposals/index', as: 'more_info_proposals'
|
||||
get 'more-information/budgets', to: 'pages#show', id: 'more_info/budgets/index', as: 'more_info_budgets'
|
||||
get 'more-information/participation/facts', to: 'pages#show', id: 'more_info/participation/facts', as: 'participation_facts'
|
||||
get 'more-information/participation/world', to: 'pages#show', id: 'more_info/participation/world', as: 'participation_world'
|
||||
|
||||
# static pages
|
||||
get '/blog' => redirect("http://blog.consul/")
|
||||
resources :pages, path: '/', only: [:show]
|
||||
|
||||
Reference in New Issue
Block a user