Merge remote-tracking branch 'origin/master' into statistics

config/locales/de.yml

@@ -1,6 +1,8 @@
 de:
   activerecord:
     attributes:
+      code_harbor_link:
+        oauth2token: OAuth2 Token
       consumer:
         name: Name
         oauth_key: OAuth Key
@@ -90,6 +92,9 @@ de:
         internal_user_ids: Mitglieder
         name: Name
     models:
+      code_harbor_link:
+        one: CodeHarbor-Link
+        other: CodeHarbor-Links
       consumer:
         one: Konsument
         other: Konsumenten

config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   activerecord:
     attributes:
+      code_harbor_link:
+        oauth2token: OAuth2 Token
       consumer:
         name: Name
         oauth_key: OAuth Key
@@ -90,6 +92,9 @@ en:
         internal_user_ids: Members
         name: Name
     models:
+      code_harbor_link:
+        one: CodeHarbor Link
+        other: CodeHarbor Links
       consumer:
         one: Consumer
         other: Consumers

config/routes.rb

@@ -1,6 +1,7 @@
 FILENAME_REGEXP = /[\w\.]+/ unless Kernel.const_defined?(:FILENAME_REGEXP)
 
 Rails.application.routes.draw do
+  resources :code_harbor_links
   resources :request_for_comments
     get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
   resources :comments, except: [:destroy] do
@@ -40,6 +41,8 @@ Rails.application.routes.draw do
     resources :hints
   end
 
+  post '/import_proforma_xml' => 'exercises#import_proforma_xml'
+
   resources :exercises do
     collection do
       match '', to: 'exercises#batch_update', via: [:patch, :put]