-
Notifications
You must be signed in to change notification settings - Fork 235
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
Conversation
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.
looks good, not many tests left 🤞 |
8c91efa
to
27792ae
Compare
I've taken this for a basic test drive in the Envato staging environment and all looks good. |
There was a problem hiding this 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 ?
app/models/git_repository.rb
Outdated
Tempfile.create('git-stderr') do |error_file| | ||
success, output = Samson::CommandExecutor.execute( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs a rebase ?
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
I think it's good to go 👍 |
Extending #4120 with more fixes:
mutex_m
, an undeclaredactivesupport
dependency.csv
, required for Ruby 3.4: this resolves a warning produced when running on Ruby 3.3.rails app:update
to merge in new configuration