Merge branch 'master' into refactor_proforma_import_export

# Conflicts:
#	spec/controllers/exercises_controller_spec.rb

config/initializers/sentry.rb

@@ -7,5 +7,33 @@ Sentry.init do |config|
   # Set tracesSampleRate to 1.0 to capture 100%
   # of transactions for performance monitoring.
   # We recommend adjusting this value in production
-  config.traces_sample_rate = 0.01
+  config.traces_sampler = lambda do |sampling_context|
+    # if this is the continuation of a trace, just use that decision (rate controlled by the caller)
+    unless sampling_context[:parent_sampled].nil?
+      next sampling_context[:parent_sampled]
+    end
+
+    # transaction_context is the transaction object in hash form
+    # keep in mind that sampling happens right after the transaction is initialized
+    # for example, at the beginning of the request
+    transaction_context = sampling_context[:transaction_context]
+
+    # transaction_context helps you sample transactions with more sophistication
+    # for example, you can provide different sample rates based on the operation or name
+    op = transaction_context[:op]
+    transaction_name = transaction_context[:name]
+
+    case op
+      when /request/
+        # for Rails applications, transaction_name would be the request's path (env["PATH_INFO"]) instead of "Controller#action"
+        case transaction_name
+          when '/', '/ping'
+            0.00 # ignore health check
+          else
+            0.05
+        end
+      else
+        0.0 # ignore all other transactions
+    end
+  end
 end

config/locales/de.yml

@@ -193,7 +193,7 @@ de:
       external_user:
         one: Externer Nutzer
         other: Externe Nutzer
-      file:
+      code_ocean/file:
         one: Datei
         other: Dateien
       file_template:
@@ -241,10 +241,12 @@ de:
   admin:
     dashboard:
       show:
+        release: Release
         current: Aktuelle Verfügbarkeit
-        history: Verfügbarkeitsverlauf
+        history: Nutzungsverlauf
         inactive: Es ist kein Runner Management aktiv.
-        quantity: Verfügbare Container
+        idleRunners: Freie Runner
+        usedRunners: Reservierte Runner
   application:
     not_authorized: Sie Sind nicht berechtigt, diese Aktion auszuführen.
     welcome:
@@ -301,6 +303,10 @@ de:
         not_synced_to_runner_management: Die Ausführungsumgebung wurde erstellt, aber aufgrund eines Fehlers nicht zum Runnermanagement synchronisiert.
     index:
       shell: Shell
+      synchronize:
+        button: Synchronisieren
+        success: Die Ausführungsumgebung wurde erfolgreich synchronisiert.
+        failure: "Beim Synchronisieren der Ausführungsumgebung ist folgender Fehler aufgetreten: %{error}"
       synchronize_all:
         button: Alle synchronisieren
         success: Alle Ausführungsumgebungen wurden erfolgreich synchronisiert.

config/locales/en.yml

@@ -193,7 +193,7 @@ en:
       external_user:
         one: External User
         other: External Users
-      file:
+      code_ocean/file:
         one: File
         other: Files
       file_template:
@@ -241,10 +241,12 @@ en:
   admin:
     dashboard:
       show:
+        release: Release
         current: Current Availability
-        history: Availability History
+        history: Usage History
         inactive: No runner management is currently enabled.
-        quantity: Available Containers
+        idleRunners: Idle Runners
+        usedRunners: Reserved Runners
   application:
     not_authorized: You are not authorized to perform this action.
     welcome:
@@ -301,9 +303,13 @@ en:
         not_synced_to_runner_management: The execution environment was created but not synced to the runner management due to an error.
     index:
       shell: Shell
+      synchronize:
+        button: Synchronize
+        success: The execution environment was synchronized successfully.
+        failure: "The execution environment could not be synchronised due to the following error: %{error}"
       synchronize_all:
         button: Synchronize all
-        success: All execution environemnts were synchronized successfully.
+        success: All execution environments were synchronized successfully.
         failure: At least one execution environment could not be synchronised due to an error.
     shell:
       command: Command

config/routes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FILENAME_REGEXP = /[\w.]+/.freeze unless Kernel.const_defined?(:FILENAME_REGEXP)
+FILENAME_REGEXP = %r{[\w./]+}.freeze unless Kernel.const_defined?(:FILENAME_REGEXP)
 
 Rails.application.routes.draw do
   resources :community_solutions, only: %i[index edit update]
@@ -66,6 +66,7 @@ Rails.application.routes.draw do
       get :shell
       post 'shell', as: :execute_command, action: :execute_command
       get :statistics
+      post :sync_to_runner_management
     end
 
     post :sync_all_to_runner_management, on: :collection