Merge branch 'master' into develop

ncbo · Nov 22, 2024 · 4cfee2a · 4cfee2a
2 parents 0488f52 + c1c0494
commit 4cfee2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -42,12 +42,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
 gem 'redcarpet'
 
 # NCBO gems (can be from a local dev path or from rubygems/git)
+gem 'goo', github: 'ncbo/goo', branch: 'develop'
 gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
 gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
 gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
-gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
-gem 'goo', github: 'ncbo/goo', branch: 'develop'
 gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
+gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
 
 group :development do
   # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -399,7 +399,6 @@ GEM
 PLATFORMS
   aarch64-linux
   arm64-darwin-22
-  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -457,4 +456,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.5.7
+   2.5.20