Bump ruby to 3.0.6 (#218)

* Bump ruby to 2.7.8
* Bump listen to 3.5.1 (remove dependency on ruby_dep)
* Bump ruby to 3.0.6
* Fix I18n.translate arguments: from hash to keyword arguments
This commit is contained in:
Riccardo Graziosi
2023-05-09 09:32:18 +02:00
committed by GitHub
parent 5b9edd4745
commit 10f06c9760
17 changed files with 35 additions and 36 deletions

View File

@@ -1 +1 @@
ruby-2.6.6 ruby-3.0.6

View File

@@ -1,7 +1,7 @@
### ###
### Build stage ### ### Build stage ###
### ###
FROM ruby:2.6.6 AS builder FROM ruby:3.0.6 AS builder
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get update -qq && apt-get install -y nodejs postgresql-client RUN apt-get update -qq && apt-get install -y nodejs postgresql-client
@@ -56,7 +56,7 @@ EXPOSE 3000
### ###
### Prod stage ### ### Prod stage ###
### ###
FROM ruby:2.6.6-slim AS prod FROM ruby:3.0.6-slim AS prod
RUN apt-get update -qq && \ RUN apt-get update -qq && \
apt-get install -yq \ apt-get install -yq \

11
Gemfile
View File

@@ -1,7 +1,8 @@
source 'https://rubygems.org' source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" } git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '2.6.6' ruby '3.0.6'
gem 'rake', '12.3.3' gem 'rake', '12.3.3'
gem 'rails', '6.0.5' gem 'rails', '6.0.5'
@@ -45,8 +46,8 @@ end
group :development do group :development do
gem 'web-console', '>= 3.3.0' gem 'web-console', '>= 3.3.0'
gem 'spring' gem 'spring', '2.1.1'
gem 'spring-watcher-listen', '~> 2.0.0' gem 'spring-watcher-listen', '2.0.1'
end end
group :test do group :test do
@@ -58,7 +59,7 @@ group :test do
end end
# If not bundled, webpack compilation in production fails # If not bundled, webpack compilation in production fails
gem 'listen', '>= 3.0.5', '< 3.2' gem 'listen', '3.5.1'
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

View File

@@ -120,10 +120,9 @@ GEM
activerecord activerecord
kaminari-core (= 1.2.2) kaminari-core (= 1.2.2)
kaminari-core (1.2.2) kaminari-core (1.2.2)
listen (3.1.5) listen (3.5.1)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.10)
ruby_dep (~> 1.2)
loofah (2.19.1) loofah (2.19.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
@@ -181,7 +180,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
rake (12.3.3) rake (12.3.3)
rb-fsevent (0.11.1) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
react-rails (2.6.2) react-rails (2.6.2)
@@ -212,7 +211,6 @@ GEM
rspec-mocks (~> 3.8.0) rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.8.0)
rspec-support (3.8.3) rspec-support (3.8.3)
ruby_dep (1.5.0)
rubyzip (2.3.2) rubyzip (2.3.2)
selenium-webdriver (4.1.0) selenium-webdriver (4.1.0)
childprocess (>= 0.5, < 5.0) childprocess (>= 0.5, < 5.0)
@@ -267,12 +265,12 @@ DEPENDENCIES
byebug byebug
capybara (= 3.36.0) capybara (= 3.36.0)
devise (= 4.7.3) devise (= 4.7.3)
httparty (= 0.21.0)
factory_bot_rails (= 5.0.2) factory_bot_rails (= 5.0.2)
httparty (= 0.21.0)
i18n-js (= 3.9.2) i18n-js (= 3.9.2)
jbuilder (= 2.11.5) jbuilder (= 2.11.5)
kaminari (= 1.2.2) kaminari (= 1.2.2)
listen (>= 3.0.5, < 3.2) listen (= 3.5.1)
pg (= 1.3.5) pg (= 1.3.5)
puma (= 4.3.12) puma (= 4.3.12)
pundit (= 2.2.0) pundit (= 2.2.0)
@@ -281,8 +279,8 @@ DEPENDENCIES
react-rails (= 2.6.2) react-rails (= 2.6.2)
rspec-rails (= 3.8.3) rspec-rails (= 3.8.3)
selenium-webdriver (= 4.1.0) selenium-webdriver (= 4.1.0)
spring spring (= 2.1.1)
spring-watcher-listen (~> 2.0.0) spring-watcher-listen (= 2.0.1)
turbolinks (= 5.2.1) turbolinks (= 5.2.1)
tzinfo-data tzinfo-data
web-console (>= 3.3.0) web-console (>= 3.3.0)
@@ -290,7 +288,7 @@ DEPENDENCIES
webpacker (= 4.3.0) webpacker (= 4.3.0)
RUBY VERSION RUBY VERSION
ruby 2.6.6p146 ruby 3.0.6p216
BUNDLED WITH BUNDLED WITH
2.3.0 2.3.0

View File

@@ -46,7 +46,7 @@ class OAuthsController < ApplicationController
flash[:notice] = I18n.t('devise.sessions.signed_in') flash[:notice] = I18n.t('devise.sessions.signed_in')
redirect_to root_path redirect_to root_path
else else
flash[:alert] = I18n.t('errors.o_auth_login_error', { name: @o_auth.name }) flash[:alert] = I18n.t('errors.o_auth_login_error', name: @o_auth.name)
redirect_to new_user_session_path redirect_to new_user_session_path
end end
elsif reason == 'test' elsif reason == 'test'

View File

@@ -1,4 +1,4 @@
<p><%= t('mailers.devise.welcome_greeting', { email: @email, site_name: Current.tenant_or_raise!.site_name }) %></p> <p><%= t('mailers.devise.welcome_greeting', email: @email, site_name: Current.tenant_or_raise!.site_name) %></p>
<p><%= t('mailers.devise.confirmation_instructions.body') %></p> <p><%= t('mailers.devise.confirmation_instructions.body') %></p>

View File

@@ -1,7 +1,7 @@
<p><%= t('mailers.devise.opening_greeting', { email: @email }) %></p> <p><%= t('mailers.devise.opening_greeting', email: @email) %></p>
<% if @resource.try(:unconfirmed_email?) %> <% if @resource.try(:unconfirmed_email?) %>
<p><%= t('mailers.devise.email_changed.body', { email: @resource.unconfirmed_email }) %></p> <p><%= t('mailers.devise.email_changed.body', email: @resource.unconfirmed_email) %></p>
<% else %> <% else %>
<p><%= t('mailers.devise.email_changed.body', { email: @resource.email }) %></p> <p><%= t('mailers.devise.email_changed.body', email: @resource.email) %></p>
<% end %> <% end %>

View File

@@ -1,3 +1,3 @@
<p><%= t('mailers.devise.opening_greeting', { email: @resource.email }) %></p> <p><%= t('mailers.devise.opening_greeting', email: @resource.email) %></p>
<p><%= t('mailers.devise.password_change.body') %></p> <p><%= t('mailers.devise.password_change.body') %></p>

View File

@@ -1,4 +1,4 @@
<p><%= t('mailers.devise.opening_greeting', { email: @resource.email }) %></p> <p><%= t('mailers.devise.opening_greeting', email: @resource.email) %></p>
<p><%= t('mailers.devise.reset_password.body') %></p> <p><%= t('mailers.devise.reset_password.body') %></p>

View File

@@ -15,7 +15,7 @@
<% if @minimum_password_length %> <% if @minimum_password_length %>
<small id="passwordHelp" class="form-text text-muted"> <small id="passwordHelp" class="form-text text-muted">
(<%= t('common.forms.auth.password_help', { count: @minimum_password_length }) %>) (<%= t('common.forms.auth.password_help', count: @minimum_password_length) %>)
</small> </small>
<% end %> <% end %>
</div> </div>

View File

@@ -45,7 +45,7 @@
<hr /> <hr />
<% @o_auths.each do |o_auth| %> <% @o_auths.each do |o_auth| %>
<p> <p>
<%= link_to t('common.forms.auth.sign_up_with', { o_auth: o_auth.name }), <%= link_to t('common.forms.auth.sign_up_with', o_auth: o_auth.name),
o_auth_start_path(o_auth, reason: 'user') %> o_auth_start_path(o_auth, reason: 'user') %>
</p> </p>
<% end %> <% end %>

View File

@@ -34,7 +34,7 @@
<hr /> <hr />
<% @o_auths.each do |o_auth| %> <% @o_auths.each do |o_auth| %>
<p> <p>
<%= link_to t('common.forms.auth.log_in_with', { o_auth: o_auth.name }), <%= link_to t('common.forms.auth.log_in_with', o_auth: o_auth.name),
o_auth_start_path(o_auth, reason: 'user') %> o_auth_start_path(o_auth, reason: 'user') %>
</p> </p>
<% end %> <% end %>

View File

@@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title><%= t('site_settings.authentication.test_page.title', { name: @o_auth.name }) %></title> <title><%= t('site_settings.authentication.test_page.title', name: @o_auth.name) %></title>
</head> </head>
<body> <body>
<h1><%= t('site_settings.authentication.test_page.title', { name: @o_auth.name }) %></h1> <h1><%= t('site_settings.authentication.test_page.title', name: @o_auth.name) %></h1>
<div> <div>
<h2><%= t('site_settings.authentication.test_page.fetched_user_data') %></h2> <h2><%= t('site_settings.authentication.test_page.fetched_user_data') %></h2>
@@ -36,7 +36,7 @@
<% end %> <% end %>
<% if @email_valid and not @name_valid %> <% if @email_valid and not @name_valid %>
<p><%= t('site_settings.authentication.test_page.warning_configuration', { name: t('defaults.user_full_name') }) %></p> <p><%= t('site_settings.authentication.test_page.warning_configuration', name: t('defaults.user_full_name')) %></p>
<% end %> <% end %>
<% if not @email_valid %> <% if not @email_valid %>

View File

@@ -1,5 +1,5 @@
<p> <p>
<%= t('mailers.user.notify_comment_owner.body', { user: @comment.user.full_name, post: @comment.post.title }) %> <%= t('mailers.user.notify_comment_owner.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p> </p>
<p> <p>

View File

@@ -1,5 +1,5 @@
<p> <p>
<%= t('mailers.user.notify_followers_of_post_status_change.body', { post: @post }) %> <%= t('mailers.user.notify_followers_of_post_status_change.body', post: @post) %>
<span style='background-color: <%= @post.post_status.color %>; color: white;'%>> <span style='background-color: <%= @post.post_status.color %>; color: white;'%>>
<%= @post.post_status.name %> <%= @post.post_status.name %>
</span> </span>

View File

@@ -1,5 +1,5 @@
<p> <p>
<%= t('mailers.user.notify_followers_of_post_update.body', { user: @comment.user.full_name, post: @comment.post.title }) %> <%= t('mailers.user.notify_followers_of_post_update.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p> </p>
<p> <p>

View File

@@ -1,5 +1,5 @@
<p> <p>
<%= t('mailers.user.notify_post_owner.body', { user: @comment.user.full_name, post: @comment.post.title }) %> <%= t('mailers.user.notify_post_owner.body', user: @comment.user.full_name, post: @comment.post.title) %>
</p> </p>
<p> <p>