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

Upgrade to Rails 6.1.7.10 and Ruby 3.0.7 #42

Merged
merged 53 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
017c707
fix: Most urls should be https
pdl Nov 11, 2024
a20da5c
chore: upgrade rails gem to 5.0.7.2, and upgrade other gems as required
pdl Nov 11, 2024
db69976
chore: rack now throws an error if you just allow everything via CORS
pdl Nov 11, 2024
ae27b4e
chore: method devise_parameter_sanitizer.for no longer exists
pdl Nov 11, 2024
8928535
chore: bundle exec rails app:update
pdl Nov 11, 2024
fdd0d88
fix: deprecation warnings
pdl Nov 11, 2024
191f230
chore: fix tests by updating rabl, capybara and groupdate
pdl Nov 11, 2024
6a2dd6c
chore: upgrade pg and specify versions of successors to schema_plus
pdl Nov 12, 2024
7920195
chore: bundle exec rails generate devise:install
pdl Nov 12, 2024
1a59631
chore: upgrade susy to deal with deprecation warnings
pdl Nov 12, 2024
b98209e
chore: upgrade susy
pdl Nov 12, 2024
73ee736
chore: fix noisy error when testing
pdl Nov 12, 2024
c6d5c63
chore: factorybot "static" attribute definitions have been deprecated
pdl Nov 12, 2024
64717ed
chore: use a different test db to SAPI repo as they break each other …
pdl Nov 12, 2024
1f8d561
chore: remove config/initializers/new_framework_defaults.rb as applic…
pdl Nov 12, 2024
a0e9821
chore: update rails to 5.1.7 and run bundle exec rails app:update
pdl Nov 12, 2024
6c3d2bb
chore: class_name takes a string; namespace constant is deprecated
pdl Nov 12, 2024
4b94bc6
chore: models should inherit from ApplicationRecord, not ActiveRecord…
pdl Nov 12, 2024
f6eb416
chore: upgrade apipipe
pdl Nov 12, 2024
f23ffa9
chore: add gem "listen"
pdl Nov 12, 2024
9e37e5d
chore: fix cors middleware definition
pdl Nov 12, 2024
f5298e0
chore: update traco
pdl Nov 13, 2024
8374a6d
chore: if rails.root contains spaces this will fail
pdl Nov 13, 2024
a02c609
chore: test support models need a lot more annotation since Rails 5.1
pdl Nov 13, 2024
862bfe5
chore: api_requests.user_id is nullable
pdl Nov 13, 2024
6e94fd7
chore: skip a test where the mock models break assumptions on Rails 5.1
pdl Nov 13, 2024
9b53662
chore: remove new framework defaults file for rails 5.1
pdl Nov 13, 2024
02f466e
chore: fix mailer secrets in staging/production environments
pdl Nov 14, 2024
5cd217a
chore: update rails to 5.2.8.1
pdl Nov 14, 2024
4ff6de0
chore: bundle exec rails app:update
pdl Nov 14, 2024
995e4fb
chore: things spotted in railsdiff
pdl Nov 15, 2024
416f228
chore: add new files in rails 5.2
pdl Nov 15, 2024
002ca90
chore: remove resolved TODO comment
pdl Nov 18, 2024
f97be9c
chore: update will_paginate, fixing tests which were breaking due to …
pdl Nov 18, 2024
7268541
chore: switch to Rails 5.2 framework defaults
pdl Nov 18, 2024
4cb17ab
chore: upgrade to Ruby 2.7.8 and update some gems required for that u…
pdl Nov 18, 2024
f4a4d29
fix: this line is a syntax error in Ruby 2.7
pdl Nov 18, 2024
8388030
chore: upgrade gems which depend on json-1.8 which emit warnings on R…
pdl Nov 18, 2024
52db2d5
chore: gem upgrades to resolve deprecation messages while running tests
pdl Nov 18, 2024
eec7552
chore: upgrade to Ruby 3.0.7 and Rails 6.0.6.1
pdl Nov 18, 2024
2e6b5ec
chore: some gemfile updates
pdl Nov 18, 2024
555b626
chore: bundle exec rails app:update
pdl Nov 18, 2024
5ebedde
chore: move to Rails 6.0 defaults
pdl Nov 18, 2024
7fc767b
chore: review .gitignore for Rails 6 and adopt it, with a few extras
pdl Nov 18, 2024
4c73b53
chore: more gemfile fixes
pdl Nov 18, 2024
e7b1895
chore: update to Rails 6.1.7.10
pdl Nov 18, 2024
a9907c3
chore: bundle exec rails app:update
pdl Nov 18, 2024
75ce9ba
fix: select2 v4 provides a compat layer which is required for initSel…
pdl Nov 18, 2024
60822af
chore: deal with another deprecation message
pdl Nov 18, 2024
44ae4d4
chore: use Rails 6.1 application defaults
pdl Nov 18, 2024
16a7779
chore: upgrade gem shoulda
pdl Nov 18, 2024
05fb3be
chore: replaced FactoryGirl with FactoryBot
pdl Nov 18, 2024
c4c3fa4
chore: remove susy and compass, they give us nothing we care about
pdl Nov 18, 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
60 changes: 33 additions & 27 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,40 @@
*.rbc
capybara-*.html
.rspec
.env
/log
/tmp
/coverage
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/schema.rb
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html
/db/*.sqlite3-journal
/db/*.sqlite3-*

# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

## Environment normalisation:
/.bundle
/vendor/bundle
# Ignore uploaded files in development.
/storage/*
!/storage/.keep

# these should all be checked in to normalise the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset
/public/assets
.byebug_history

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
# Ignore master key for decrypting credentials and more.
/config/master.key

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json
# Other files not .gitignored in Rails by default
.env
.rspec
/coverage/*
!/coverage/.keep
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
3.0.7
136 changes: 97 additions & 39 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,64 +1,120 @@
source 'https://rubygems.org'

gem 'rails', '4.2.5.2'
gem 'apipie-rails' # Documentation
gem 'devise', '>= 3.5.10'
gem 'annotate'
gem 'sass-rails'#, '~> 3.2.3'
gem 'uglifier'#, '>= 1.0.3'
gem 'susy', '~> 1.0.9'
gem 'compass'#, '>= 0.12.2'
gem 'compass-rails'#, '>= 1.0.3'
gem 'will_paginate' #, '~> 3.0.6'
gem 'api_pagination_headers'
gem 'traco'
gem 'httparty'
gem 'select2-rails'
gem 'groupdate'
gem "chartkick"
gem 'rails', '6.1.7.10'

gem 'psych', '~> 4'

# Use Puma as the app server
gem 'puma', '~> 4.1'

gem 'apipie-rails', '~> 0.6'

# devise provides authentication
gem 'devise', '~> 4.9.4'

# annotate maintains comments at the top of model files describing the schema,
# using the database as the source of truth
gem 'annotate', '3.1.0'

# Frontend CSS and minification
gem 'sass-rails', '~> 5.0.8'
gem 'uglifier', '~> 2.7.2'

# Frontend components
gem 'select2-rails', '~> 4.0.13'
gem 'chartkick', '~> 1.3.2'

# Provides group_by_day et al. on ActiveRecord models and queries
gem 'groupdate', '~> 6.2.1'

# pagination
gem 'will_paginate', '~> 4.0.0'
gem 'api_pagination_headers', '~> 2.1.1'

# i18n
gem 'traco', '~> 5.3.3' # TODO: switch to mobility

# HTTP user agent
gem 'httparty', '~> 0.22'

group :test do
gem 'shoulda'
gem 'capybara'
gem 'factory_girl_rails'
gem 'simplecov', require: false
gem 'codeclimate-test-reporter', require: nil
gem 'link_header'
gem 'launchy'
gem 'mocha'
# Test assertion library.
# UPGRADE TODO: Shoulda is tested and supported against Ruby 3.0+, Rails 6.1+,
# RSpec 3.x, Minitest 4.x, and Test::Unit 3.x. For Ruby < 3 and Rails < 6.1
# compatibility, please use v4.0.0.
gem 'shoulda', '~> 5.0.0.rc1'

# Integration testing
gem 'capybara', '~> 2.8'

# Helps build test fixtures
gem 'factory_bot_rails', '~> 4.11.1'

# coverage reports
gem 'simplecov', '~> 0.17.1', require: false
# gem 'codeclimate-test-reporter', require: nil # UPGRADE: removed

# Used in test/controllers/api/v1/taxon_concepts_test.rb to parse HTTP
# link headers and verify they're correct
gem 'link_header', '~> 0.0.8'

# For laun
# gem 'launchy', '~> 2.4.3'

# Mocks and stubs. Not equivalent to https://mochajs.org/
gem 'mocha', '~> 1.1.0'
end

group :staging, :production do
gem 'dotenv-rails'
end

# Use postgresql as the database for Active Record
gem 'pg'
gem 'schema_plus'
gem 'pg', '~> 1.2'

# gem 'schema_plus', '~> 2.1.0' # was 1.8.7
gem 'schema_associations', '~> 1.4.0';
gem 'schema_auto_foreign_keys', '~> 1.1.0';
gem 'schema_validations', '~> 2.4.1';

# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 5.0.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
gem 'jquery-rails', '~> 4.6.0'

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
gem 'turbolinks', '~> 2.5.3'

# Build JSON / XML API
gem 'rabl'
gem 'rabl', '~> 0.16.1'

# Also add either `oj` or `yajl-ruby` as the JSON parser
gem 'oj'
gem 'oj', '~> 3'

# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'sdoc', '~> 1.1.0', group: :doc

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', group: :development
# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '~> 1.18.4', require: false

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '~> 3.7.0'
gem 'listen', '~> 3.2'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', '~> 1.6.4'
gem 'spring-watcher-listen', '~> 2.0.0'

# Capistrano for rails deployment
gem 'capistrano', '~> 3.4.0'
gem 'capistrano-rails'
gem 'capistrano-bundler'
gem 'capistrano-rvm'
gem 'capistrano-rails', '~> 1.6.3'
gem 'capistrano-bundler', '~> 2.1.1'
gem 'capistrano-rvm', '~> 0.1.2'
gem 'capistrano-maintenance', '~> 1.0', require: false
gem 'capistrano-passenger', '~> 0.1.1', require: false
gem 'rack-cors', :require => 'rack/cors'
Expand All @@ -71,7 +127,9 @@ group :development do
end

group :development, :test do
gem 'byebug'
# A better debugger
gem 'byebug', '~> 10.0.2'
end

gem 'appsignal'
# Error monitoring
gem 'appsignal', '~> 3.3.11'
Loading