Skip to content

Commit

Permalink
Merge pull request #22 from ncbo/master
Browse files Browse the repository at this point in the history
Sync: bring OntoPortal up-to-date with BioPortal releases 6.17.0 and onward
  • Loading branch information
syphax-bouazzouni authored Oct 10, 2024
2 parents 97384d1 + a8753d9 commit d9b7431
Show file tree
Hide file tree
Showing 49 changed files with 1,271 additions and 1,042 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ node_modules
/config/credentials/test.key
/config/credentials/staging.key
/config/credentials/production.key
/config/credentials/appliance.key

/app/assets/builds/*
!/app/assets/builds/.keep
Expand Down
10 changes: 8 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ gem 'graphql', '~> 2.0.27'
gem 'graphql-client'
gem 'haml', '~> 5.1'
gem 'i18n'
gem 'iconv'
gem 'iso-639', '~> 0.3.6'
gem 'multi_json'
gem 'mysql2', '0.5.5'
gem 'oj'
gem 'ontologies_api_client', github: 'ncbo/ontologies_api_ruby_client', tag: 'v2.2.5'
gem 'ontologies_api_client', github: 'ncbo/ontologies_api_ruby_client', tag: 'v2.4.0'
gem 'open_uri_redirections'
gem 'pry'
gem 'psych', '< 4'
Expand All @@ -69,9 +68,16 @@ gem 'recaptcha', '~> 5.9.0'
gem 'rest-client'
gem 'rexml', '~> 3'
gem 'stackprof', require: false

# pinning strscan to v 3.0.1 to deal with deployment issue. Remove line below when issue is fixed
gem 'strscan', '3.0.1'

gem 'terser'
gem 'thin'
gem 'will_paginate', '~> 3.0'
gem 'net-ftp'
gem 'flag-icons-rails', '~> 3.4'
gem 'inline_svg'

group :staging, :production do
# Application monitoring
Expand Down
Loading

0 comments on commit d9b7431

Please sign in to comment.