merge master

2019-12-03 17:55:58 +01:00
parent 94026dcedf 1270bc3684
commit 4a77536c5f
26 changed files with 3405 additions and 1620 deletions
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -353,6 +353,7 @@ de:
      implement: Implementieren
      test_files: Test-Dateien
      feedback: Feedback
+      requests_for_comments: Kommentaranfragen
      study_group_dashboard: Live Dashboard
    statistics:
      average_score: Durchschnittliche Punktzahl
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -398,6 +398,7 @@ en:
      implement: Implement
      test_files: Test Files
      feedback: Feedback
+      requests_for_comments: Requests for Comments
      study_group_dashboard: Live Dashboard
    show:
      is_unpublished: Exercise is unpublished
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,6 +82,7 @@ Rails.application.routes.draw do
      post :search
      get :statistics
      get :feedback
+      get :requests_for_comments
      get :reload
      post :submit
      get 'study_group_dashboard/:study_group_id', to: 'exercises#study_group_dashboard'