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.

Sign up for GitHub

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

Jump to bottom

[WIP] Upgrade to Ruby 3.3 #3864

Closed
wants to merge 19 commits into from
Closed

[WIP] Upgrade to Ruby 3.3 #3864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9a474c3
Upgrade Ruby to version 3.3 and Node to version 18
mayorova Jul 19, 2024
5848e18
Monkey patch Files to add #exists? method
mayorova Aug 8, 2024
9e52e4b
Update CircleCI config and the builder image
mayorova Jul 19, 2024
7125999
Fix keyword arguments for Ruby 3 compatibility
mayorova Jul 19, 2024
b34c862
Fix keyword arguments for representers and 'with_options'
mayorova Jul 19, 2024
16b4b75
Fix keyword arguments in new accounts query and sifter
mayorova Jul 19, 2024
fa4783c
Fix deprecated ActiveModel::Errors usage
mayorova Jul 19, 2024
a1ca3c4
Fix decorators by making methods non-private
mayorova Jul 19, 2024
f9c3e4f
Fix URI.escape and URI.encode which are not available in Ruby 3
mayorova Jul 19, 2024
51fc075
Fix various hacks that are not needed anymore after Ruby upgrade
mayorova Jul 19, 2024
e088b15
Skip the test using fibers
mayorova Jul 19, 2024
910e7c4
Fix deprecation warning for `fixture_file_upload`
mayorova Jul 19, 2024
42e3638
Remove URL hacks for Liquid
mayorova Jul 19, 2024
a16294a
Remove an unused Dockerfile
mayorova Jul 22, 2024
e3de2ef
Add 'matrix' gem required by current versions of prawn and capybara gems
mayorova Jul 22, 2024
408c8d5
Upgrade the upstream Dockerfile
mayorova Jul 22, 2024
8f37e9b
Update decorators
mayorova Jul 25, 2024
9bd6ed4
Update billing service
mayorova Jul 25, 2024
a26ee23
Fix user tracking error reporting
mayorova Jul 30, 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
146 changes: 73 additions & 73 deletions .circleci/config.yml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .tool-versions.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 2.7.6
nodejs 16.19.1
ruby 3.3.1
nodejs 18.20.4
python 2.7.18
33 changes: 0 additions & 33 deletions Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 9 additions & 8 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ gem 'aws-sdk-s3', '~> 1'
gem 'dotenv-rails', '~> 2.7'
gem 'rails', '~> 6.1'

# Locking mail to 2.7.x, as 2.8 has a regression related to `enable_starttls_auto` setting:
# https://github.com/mikel/mail/blob/2-8-stable/CHANGELOG.rdoc#version-281-unreleased-
# Also, upgrading makes this test fail: SendUserInvitationWorkerTest#test_handles_errors
gem 'mail', '~> 2.7.1'
gem 'mail', '~> 2.8.1'

gem "activejob-uniqueness"
# Needed for XML serialization of ActiveRecord::Base
Expand All @@ -44,6 +41,8 @@ gem 'bcrypt', '~> 3.1.7'
gem 'oauth2', '~> 2.0'
gem 'open_id_authentication'

gem 'sorted_set', '~> 1.0'

gem 'i18n'

# Apisonator client
Expand Down Expand Up @@ -73,7 +72,7 @@ gem 'stripe', '~> 5.28.0' # we need the stripe gem because activemerchant can no
gem 'acts_as_list', '~> 0.9.17'
gem 'braintree', '~> 2.93'
gem 'bugsnag', '~> 6.26'
gem 'cancancan', '~> 3.0.0'
gem 'cancancan', '~> 3.6.0'
gem 'formtastic', '~> 4.0'
gem 'htmlentities', '~>4.3', '>= 4.3.4'
# TODO: Not actively maintained https://github.com/activeadmin/inherited_resources#notice replace with respond_with and fix things the rails way
Expand Down Expand Up @@ -101,6 +100,7 @@ gem 'httpclient', github: '3scale/httpclient', branch: 'ssl-env-cert'
gem 'json-schema', git: 'https://github.com/3scale/json-schema.git'
gem 'local-fastimage_resize', '~> 3.4.0', require: 'fastimage/resize'
gem 'kt-paperclip', '~> 7.2'
gem 'matrix', '~> 0.4.2'
gem 'prawn'
gem 'prawn-table', git: "https://github.com/prawnpdf/prawn-table.git", branch: "38b5bdb5dd95237646675c968091706f57a7a641"
gem 'prawn-svg'
Expand All @@ -120,7 +120,8 @@ gem 'ts-datetime-delta', require: 'thinking_sphinx/deltas/datetime_delta'
gem 'will_paginate', '~> 3.3'
gem 'zip-zip', require: false

gem 'acts_as_tree'
# TODO: this gem seems a bit abandoned, consider getting rid of it
gem 'acts_as_tree', '~> 2.9.1'
gem 'addressable', require: false
gem 'hashie', require: false
gem 'rack-x_served_by', '~> 0.1.1'
Expand Down Expand Up @@ -158,7 +159,7 @@ gem 'html-pipeline'
gem 'ruby-openid'
gem 'slim-rails', '~> 3.2'

gem 'draper', '~> 3.1'
gem 'draper', '~> 4.0.2'

group :development do
gem 'listen'
Expand Down Expand Up @@ -188,7 +189,7 @@ group :test do
gem 'rails-controller-testing', '~> 1.0.4'
gem 'simplecov', '~> 0.21.2', require: false

gem 'capybara', '~>3.35.3', source: 'https://rubygems.org'
gem 'capybara', '~>3.35.3'
gem 'xpath', '~>3.2.0'

gem 'chronic'
Expand Down
Loading