Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync: bring OntoPortal up-to-date with BioPortal releases 6.15.0 and onward #19

Merged
merged 37 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
78aaa9b
Bump rails from 6.1.7.3 to 7.0.8
jvendetti Nov 30, 2023
dee0f62
Result of app:update
jvendetti Nov 30, 2023
8031913
Result of db:migrate
jvendetti Dec 1, 2023
b290746
Add purl configuration settings for test mode
jvendetti Dec 5, 2023
d66b10b
Exit License model tests if appliance ID changes
jvendetti Dec 5, 2023
4244c62
Fix broken License model unit tests
jvendetti Dec 8, 2023
dd4a774
Fix some RuboCop warnings
jvendetti Dec 8, 2023
156ff9f
Enable a subset of the new framework defaults
jvendetti Dec 19, 2023
fb97874
Temporary pointer to ontologies_api_client branch
jvendetti Dec 19, 2023
67aa1bd
Bump ontologies_api_client to v2.2.5 tag
jvendetti Jan 17, 2024
e664bab
Remove old framework default files
jvendetti Jan 17, 2024
a5b130e
Merge pull request #302 from ncbo/refactor/rails-7-upgrade/297
jvendetti Jan 19, 2024
a6ff806
Bump copyright
jvendetti Feb 15, 2024
35370ea
Fix undefined method error
jvendetti Feb 15, 2024
1d54018
Fix some RuboCop warnings
jvendetti Feb 15, 2024
a200f3f
Replace sass-rails with sassc-rails
jvendetti Jan 30, 2024
ef2098e
Add sprockets-rails gem and update from 3 to 4
jvendetti Jan 30, 2024
3fe990b
Install jsbundling-rails
jvendetti Jan 31, 2024
e9710fb
Rename build script entry point
jvendetti Jan 31, 2024
06ac94c
Update manifest.js
jvendetti Feb 1, 2024
cd23fb4
Install Turbo
jvendetti Feb 26, 2024
b4fda30
Install Stimulus
jvendetti Feb 29, 2024
2c4685c
Add include tags for JS bundled with esbuild
jvendetti Mar 6, 2024
3cd25de
Fix some RuboCop warnings
jvendetti Mar 6, 2024
edd87a9
Remove example Stimulus controller
jvendetti Mar 6, 2024
54a3537
Add more Rails 7 default gems
jvendetti Mar 7, 2024
44f3fe6
Fix uninitialized constant error
jvendetti Mar 7, 2024
364a484
Encode username component in login_as link
jvendetti Mar 9, 2024
1deef1f
Encode username component for deletion
jvendetti Mar 9, 2024
9b3ef6a
Merge pull request #309 from ncbo/refactor/rails-7-upgrade-continued
jvendetti Mar 11, 2024
0cb0a61
Add ISO 639-1 language codes
jvendetti Apr 23, 2024
fdbbd1f
Add language selector to submission form
jvendetti Apr 23, 2024
d18a8be
Update Gemfile.lock
jvendetti Apr 23, 2024
d48b004
Remove YAML language code config
jvendetti Apr 24, 2024
a076188
Add the iso-639 gem
jvendetti Apr 24, 2024
17acf40
Get language codes from the iso-639 gem
jvendetti Apr 24, 2024
aedcaf6
Merge pull request #314 from ncbo/feature/language-selector/311
jvendetti Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,8 @@ node_modules
/config/credentials/test.key
/config/credentials/staging.key
/config/credentials/production.key

/app/assets/builds/*
!/app/assets/builds/.keep

/node_modules
69 changes: 46 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,47 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.1.7.3'
gem 'rails', '7.0.8'

gem 'sass-rails', '~> 5.0'
gem 'terser'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
# gem 'duktape'
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails', require: 'sprockets/railtie'

# Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
gem 'jsbundling-rails', '~> 1.3'

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem 'turbo-rails'

# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
gem 'stimulus-rails'

# Build JSON APIs with ease [https://github.com/rails/jbuilder]
# gem 'jbuilder'

# Use Redis for Action Cable
gem 'redis', '~> 4.0'

# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
# gem 'kredis'

# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
# gem "bcrypt", "~> 3.1.7"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', require: false

# Use Sass to process CSS
gem 'sassc-rails'

gem 'bootstrap', '~> 5.2.3'
gem 'chart-js-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'select2-rails'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# To use Jbuilder templates for JSON
# gem 'jbuilder'

# To use debugger
# gem 'debugger'

gem 'base64', '0.1.0'
gem 'cube-ruby', require: 'cube'
gem 'dalli'
Expand All @@ -36,9 +54,11 @@ 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 'open_uri_redirections'
gem 'pry'
gem 'psych', '< 4'
Expand All @@ -49,39 +69,42 @@ gem 'recaptcha', '~> 5.9.0'
gem 'rest-client'
gem 'rexml', '~> 3'
gem 'stackprof', require: false
gem 'terser'
gem 'thin'
gem 'will_paginate', '~> 3.0'

gem 'ontologies_api_client', github: 'ncbo/ontologies_api_ruby_client', tag: 'v2.2.4'

group :staging, :production do
# application monitoring
# Application monitoring
gem 'newrelic_rpm'
# logs in json format, useful for shipping logs to logstash
# Logs in json format, useful for shipping logs to logstash
# gem 'rackstash', git: 'https://github.com/planio-gmbh/rackstash.git'
# gem 'logstash-logger'
end

group :development do
# Capistrano Deployment
# Capistrano deployment
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'capistrano', '~> 3.17', require: false
gem 'capistrano-bundler', require: false
gem 'capistrano-rbenv', require: false
gem 'capistrano-locally', require: false
gem 'capistrano-passenger', require: false
gem 'capistrano-rails', '~> 1.4', require: false
gem 'capistrano-rbenv', require: false
gem 'capistrano-yarn', require: false
gem 'ed25519', '>= 1.2', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'html2haml'
gem 'listen'
# static code analysis

# Static code analysis
gem 'brakeman', require: false
gem 'rubocop', require: false

# gem 'i18n-debug'
end

group :test, :development do
group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem 'debug', platforms: %i[mri mingw x64_mingw]
gem 'rspec-rails'
end

Expand Down
Loading
Loading