Merge branch 'master' into develop

.gitignore

@@ -68,3 +68,5 @@ test/test_run.log
 test/data/ontology_files/catalog-v001.xml
 
 create_permissions.log
+
+ontologies_api.iml

Gemfile

@@ -38,16 +38,16 @@ gem 'unicorn'
 gem 'unicorn-worker-killer'
 
 # Templating
-gem 'haml'
+gem 'haml', '~> 5.2.2'
 gem 'redcarpet'
 
 # NCBO
-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 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
-gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
+gem 'goo', github: 'ncbo/goo', branch: 'master'
+gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
+gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
+gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
+gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
+gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
 
 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

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: 204cecf98bedb30f8b4b6e6afb1984f7659175d8
-  branch: develop
+  revision: 077c674a6e277a51dca4ca681e49e3e3a55b918a
+  branch: master
   specs:
     goo (0.0.2)
       addressable (~> 2.8)
@@ -15,8 +15,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_annotator.git
-  revision: 75d1a8f302c8af4060bf62fc619f230084da521e
-  branch: develop
+  revision: 71d41e3afb35dafe29abfb6d9becaadc725bad36
+  branch: master
   specs:
     ncbo_annotator (0.0.1)
       goo
@@ -26,8 +26,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_cron.git
-  revision: 8ad6ad0eeca284adfadaa01bded1d039318d6dca
-  branch: develop
+  revision: a1a4babc0b5e36325b5af667a6a50b7af1f5f891
+  branch: master
   specs:
     ncbo_cron (0.0.1)
       dante
@@ -42,8 +42,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_ontology_recommender.git
-  revision: 4ce8fe8a8ea330b5cdd246287016f71032a4bf7a
-  branch: develop
+  revision: 6010ff60b99dc1282822b8a1fb59bd59f453755f
+  branch: master
   specs:
     ncbo_ontology_recommender (0.0.1)
       goo
@@ -53,8 +53,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: 8628abe3c349052fd389751db203b27e6e541087
-  branch: develop
+  revision: 4f9139d870c3b1771af1127afa17b679bd0f60dc
+  branch: master
   specs:
     ontologies_linked_data (0.0.1)
       activesupport
@@ -74,7 +74,7 @@ GIT
 GIT
   remote: https://github.com/ncbo/sparql-client.git
   revision: fb4a89b420f8eb6dda5190a126b6c62e32c4c0c9
-  branch: develop
+  branch: master
   specs:
     sparql-client (1.0.1)
       json_pure (>= 1.4)
@@ -177,9 +177,8 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    haml (6.0.10)
-      temple (>= 0.8.2)
-      thor
+    haml (5.2.2)
+      temple (>= 0.8.0)
       tilt
     http-accept (1.7.0)
     http-cookie (1.0.5)
@@ -216,7 +215,7 @@ GEM
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.0.1)
     netrc (0.11.0)
-    newrelic_rpm (8.13.0)
+    newrelic_rpm (8.13.1)
     oj (2.18.5)
     omni_logger (0.1.4)
       logger
@@ -309,7 +308,6 @@ GEM
       net-ssh (>= 2.8.0)
     systemu (2.6.5)
     temple (0.9.1)
-    thor (1.2.1)
     tilt (2.0.11)
     trailblazer-option (0.1.2)
     tzinfo (2.0.5)
@@ -329,7 +327,6 @@ GEM
     webrick (1.7.0)
 
 PLATFORMS
-  x86_64-darwin-18
   x86_64-darwin-21
   x86_64-linux
 
@@ -346,7 +343,7 @@ DEPENDENCIES
   faraday (~> 1.9)
   ffi
   goo!
-  haml
+  haml (~> 5.2.2)
   json-schema (~> 2.0)
   minitest (~> 4.0)
   minitest-stub_any_instance
@@ -384,4 +381,4 @@ DEPENDENCIES
   unicorn-worker-killer
 
 BUNDLED WITH
-   2.3.14
+   2.3.23