Merge branch 'master' into client-routesv2

This commit is contained in:
Niklas Kiefer
2017-04-25 13:50:08 +02:00
99 changed files with 2222 additions and 109 deletions

View File

@ -10,6 +10,7 @@ Rails.application.routes.draw do
resources :request_for_comments do
member do
get :mark_as_solved
post :create_comment_exercise
end
end
resources :comments, except: [:destroy] do
@ -60,12 +61,46 @@ Rails.application.routes.draw do
member do
post :clone
get :implement
get :working_times
post :intervention
post :search
get :statistics
get :reload
post :submit
end
end
resources :proxy_exercises do
member do
post :clone
get :reload
post :submit
end
end
resources :tags do
member do
post :clone
get :reload
post :submit
end
end
resources :user_exercise_feedbacks do
member do
get :reload
post :submit
end
end
resources :interventions do
member do
post :clone
get :reload
post :submit
end
end
resources :external_users, only: [:index, :show], concerns: :statistics do
resources :exercises, concerns: :statistics
end