Merge branch 'development' into feature/ecoportal/align-to-agroportal…

…-3.0
lifewatch-eric · Oct 26, 2024 · 66e7f4b · 66e7f4b
2 parents e0ba563 + fea0612
commit 66e7f4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 86 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,14 +4,16 @@ GIT
   branch: master
   specs:
     ontologies_api_client (2.2.0)
-      activesupport
+      activesupport (~> 7.0.4)
       excon
       faraday
       faraday-excon (~> 2.0.0)
       faraday-multipart
       lz4-ruby
       multi_json
       oj
+      parallel
+      request_store
       spawnling (= 2.1.5)
 
 GEM
@@ -448,6 +450,8 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
+    request_store (1.7.0)
+      rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -596,6 +600,7 @@ GEM
 PLATFORMS
   x86_64-darwin-23
   x86_64-linux
+  x86_64-linux-musl
 
 DEPENDENCIES
   bcrypt_pbkdf (>= 1.0, < 2.0)

diff --git a/app/controllers/ajax_proxy_controller.rb b/app/controllers/ajax_proxy_controller.rb