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

Bump Rails from 6.1 to 7.0 #4125

Merged
merged 13 commits into from
Jan 26, 2025
Merged

Bump Rails from 6.1 to 7.0 #4125

merged 13 commits into from
Jan 26, 2025

Conversation

orien
Copy link
Contributor

@orien orien commented Jan 22, 2025

Extending #4120 with more fixes:

  • Merge master.
  • Add mutex_m, an undeclared activesupport dependency.
  • Add csv, required for Ruby 3.4: this resolves a warning produced when running on Ruby 3.3.
  • Run rails app:update to merge in new configuration
  • Bump the Rails default configuration from 6.1 to 7.0.
  • Bump Rails to 7.0.8.7, resolves CVE-2024-54133.

grosser and others added 9 commits October 31, 2024 12:44
Resolves the warning:

> /ruby/3.3.6/lib/ruby/gems/3.3.0/gems/activesupport-7.0.8.6/lib/active_support/notifications/fanout.rb:3:
> warning: /ruby/3.3.6/lib/ruby/3.3.0/mutex_m.rb was loaded from the standard library, but will no longer
> be part of the default gems starting from Ruby 3.4.0.> You can add mutex_m to your Gemfile or gemspec
> to silence this warning.
@orien orien requested review from a team and grosser as code owners January 22, 2025 20:34
@grosser
Copy link
Contributor

grosser commented Jan 22, 2025

looks good, not many tests left 🤞

@orien orien force-pushed the rails-7.0 branch 2 times, most recently from 8c91efa to 27792ae Compare January 24, 2025 19:57
@orien
Copy link
Contributor Author

orien commented Jan 26, 2025

I've taken this for a basic test drive in the Envato staging environment and all looks good.

Copy link
Contributor

@grosser grosser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not seeing any red flags, good to go as is or you want to rebase it on master first ?

Comment on lines 190 to 191
Tempfile.create('git-stderr') do |error_file|
success, output = Samson::CommandExecutor.execute(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs a rebase ?

Copy link
Contributor Author

@orien orien Jan 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is targeting your grosser/7 branch. Hence, this is including commits from master in the merge.

Alternatively, I could change it to target the master branch. This would include commits from #4120. Would you prefer this option?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 I think the alternative option would be less confusing. Updated.

config.action_mailer.perform_caching = false

default_url_options[:port] = config.samson.uri.port

# Raise an error on page load if there are pending migrations
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would love this to be raise so upgrades are smoother ... but can be later

@orien orien changed the base branch from grosser/7 to master January 26, 2025 10:42
@orien orien changed the title More work towards Rails 7.0 Bump Rails from 6.1 to 7.0 Jan 26, 2025
@orien
Copy link
Contributor Author

orien commented Jan 26, 2025

I think it's good to go 👍

@grosser grosser merged commit e5cfbc0 into zendesk:master Jan 26, 2025
9 checks passed
@orien orien deleted the rails-7.0 branch January 27, 2025 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants