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

…-3.0
lifewatch-eric · Nov 19, 2024 · 0e882c1 · 0e882c1
2 parents 21db11f + f5dbf31
commit 0e882c1
Show file tree

Hide file tree

Showing 87 changed files with 659 additions and 1,522 deletions.
diff --git a/.env.sample b/.env.sample
@@ -39,5 +39,3 @@ OP_API_URL="https://data.bioontology.org"
 API_IMAGE_REPOSITORY=agroportal
 ## Image tag/version from which the ontoportal api will be built
 API_IMAGE_TAG=master
-
-
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -162,7 +162,7 @@ GEM
     ed25519 (1.3.0)
     erubi (1.13.0)
     erubis (2.7.0)
-    excon (1.0.0)
+    excon (0.112.0)
     execjs (2.10.0)
     faraday (2.0.1)
       faraday-net_http (~> 2.0)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -12,13 +12,9 @@
 //
 //= require bioportal
 //= require admin/licenses
-//= require bp_ajax_controller
-//= require bp_notes
 //= require bp_form_complete
 //= require bp_admin
 //= require concepts
 //= require projects
 //= require Chart.min
 //= require application_esbuild
-
-
diff --git a/app/assets/javascripts/bp_ajax_controller.js b/app/assets/javascripts/bp_ajax_controller.js
diff --git a/app/assets/javascripts/bp_notes.js b/app/assets/javascripts/bp_notes.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,5 +39,3 @@ OP_API_URL="https://data.bioontology.org"
		API_IMAGE_REPOSITORY=agroportal
		## Image tag/version from which the ontoportal api will be built
		API_IMAGE_TAG=master