Merge pull request #13 from ncbo/master

Sync: bring OntoPortal up-to-date with BioPortal releases 6.10.6 and onward
ontoportal · Aug 19, 2023 · ccac202 · ccac202
2 parents 71c7325 + fbaaf1f
commit ccac202
Show file tree

Hide file tree

Showing 52 changed files with 287 additions and 639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,10 +39,8 @@ config/newrelic.yml
 
 node_modules
 
-# Encryption keys
-/config/master.key
+# Ignore keys for decrypting credentials
 /config/credentials/development.key
 /config/credentials/test.key
 /config/credentials/staging.key
-/config/credentials/appliance.key
-
+/config/credentials/production.key
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.1.5.1'
+gem 'rails', '6.1.7.3'
 
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.0.3'
@@ -48,7 +48,7 @@ gem 'stackprof', require: false
 gem 'thin'
 gem 'will_paginate', '~> 3.0'
 
-gem 'ontologies_api_client', github: 'ncbo/ontologies_api_ruby_client', tag: 'v2.2.1'
+gem 'ontologies_api_client', github: 'ncbo/ontologies_api_ruby_client', tag: 'v2.2.4'
 
 group :staging, :production do
   # application monitoring