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 ruby and rails #749

Open
wants to merge 18 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
if: ${{ steps.rb-changed.outputs.changed-files != ''}}
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.4
ruby-version: 3.3.7
bundler-cache: true

- name: Run RuboCop
Expand Down
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"
# We only pin versions to specific Git commits when they are "problem childs"
# and we want to review each commit before updating to the latest version.

ruby "3.1.4"
ruby "3.3.7"

gem "active_model_serializers", "~> 0.10"
gem "activerecord-import", "~>1.7"
Expand All @@ -19,6 +19,7 @@ gem "clipboard-rails", "~> 1.7"
gem "coffee-rails", "~> 5.0" # CoffeeScript for .coffee assets and views
gem "commontator", "~> 7.0.1"
gem "coveralls", "~> 0.7", require: false
gem "csv", "~> 3.3" # silence warning: no longer part of default gems for Ruby >=3.4.0
gem "dalli", "~> 3.2" # caching to memcached in production
gem "devise", "~> 4.9"
gem "devise-bootstrap-views", "~> 1.1"
Expand Down Expand Up @@ -46,7 +47,7 @@ gem "progress_bar", "~> 1.3"
gem "prometheus_exporter", "~> 2.1"
gem "puma", "~> 6.4" # app server
gem "rack", "~> 2.2"
gem "rails", "~> 7.1.3"
gem "rails", "~> 7.2.2"
gem "rails-i18n", "~> 7.0"
gem "responders", "~> 3.1"
gem "rgl", "~> 0.6"
Expand All @@ -62,7 +63,7 @@ gem "sunspot_rails", "~> 2.7"
gem "sunspot_solr", "~> 2.7"
gem "terser", "~> 1.2" # Ruby wrapper for UglifyJS JavaScript compressor
gem "thredded", git: "https://github.com/thredded/thredded.git",
ref: "1340e913affd1af5fcc060fbccd271184ece9a6a"
ref: "94fbf890a984527bab399c8c7f1eec7af7006843"
gem "thredded-markdown_katex",
git: "https://github.com/thredded/thredded-markdown_katex.git",
ref: "e2830bdb40880018a0e59d2b82c94b0a9f237365"
Expand All @@ -73,6 +74,7 @@ gem "webpacker", "~> 5.4"
group :development, :docker_development do
gem "listen", "~> 3.9"
gem "marcel", "~> 1.0"
gem "mutex_m", "~> 0.3" # silence warning: no longer part of default gems for Ruby >=3.4.0
gem "pgreset", "~> 0.4"
gem "rails-erd", "~> 1.7"
gem "rubocop", "~> 1.65", require: false
Expand Down
159 changes: 78 additions & 81 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GIT

GIT
remote: https://github.com/thredded/thredded.git
revision: 1340e913affd1af5fcc060fbccd271184ece9a6a
ref: 1340e913affd1af5fcc060fbccd271184ece9a6a
revision: 94fbf890a984527bab399c8c7f1eec7af7006843
ref: 94fbf890a984527bab399c8c7f1eec7af7006843
specs:
thredded (1.1.0)
active_record_union (>= 1.3.0)
Expand All @@ -26,11 +26,10 @@ GIT
nokogiri
onebox (>= 1.8.99)
pundit (>= 1.1.0)
rails (> 6.0.0.rc2)
rails (>= 7.0)
rails_gravatar
rinku
sanitize
sassc-rails (>= 2.0.0)
sprockets-es6
timeago_js (>= 3.0.2.2)

Expand All @@ -41,51 +40,46 @@ GEM
RubyInline (3.14.1)
ZenTest (~> 4.3)
ZenTest (4.12.2)
actioncable (7.1.5.1)
actionpack (= 7.1.5.1)
activesupport (= 7.1.5.1)
actioncable (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.5.1)
actionpack (= 7.1.5.1)
activejob (= 7.1.5.1)
activerecord (= 7.1.5.1)
activestorage (= 7.1.5.1)
activesupport (= 7.1.5.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.5.1)
actionpack (= 7.1.5.1)
actionview (= 7.1.5.1)
activejob (= 7.1.5.1)
activesupport (= 7.1.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
actionmailer (7.2.2.1)
actionpack (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.5.1)
actionview (= 7.1.5.1)
activesupport (= 7.1.5.1)
actionpack (7.2.2.1)
actionview (= 7.2.2.1)
activesupport (= 7.2.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.5.1)
actionpack (= 7.1.5.1)
activerecord (= 7.1.5.1)
activestorage (= 7.1.5.1)
activesupport (= 7.1.5.1)
useragent (~> 0.16)
actiontext (7.2.2.1)
actionpack (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.5.1)
activesupport (= 7.1.5.1)
actionview (7.2.2.1)
activesupport (= 7.2.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
Expand All @@ -97,38 +91,37 @@ GEM
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
active_record_union (1.3.0)
activerecord (>= 4.0)
activejob (7.1.5.1)
activesupport (= 7.1.5.1)
activejob (7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.3.6)
activemodel (7.1.5.1)
activesupport (= 7.1.5.1)
activerecord (7.1.5.1)
activemodel (= 7.1.5.1)
activesupport (= 7.1.5.1)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activerecord-import (1.8.1)
activerecord (>= 4.2)
activerecord-nulldb-adapter (1.1.1)
activerecord (>= 6.0, < 8.1)
activestorage (7.1.5.1)
actionpack (= 7.1.5.1)
activejob (= 7.1.5.1)
activerecord (= 7.1.5.1)
activesupport (= 7.1.5.1)
activestorage (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activesupport (= 7.2.2.1)
marcel (~> 1.0)
activesupport (7.1.5.1)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
securerandom (>= 0.3)
tzinfo (~> 2.0)
tzinfo (~> 2.0, >= 2.0.5)
acts_as_list (1.2.4)
activerecord (>= 6.1)
activesupport (>= 6.1)
Expand Down Expand Up @@ -190,6 +183,7 @@ GEM
crass (1.0.6)
css_parser (1.21.0)
addressable
csv (3.3.2)
dalli (3.2.8)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
Expand Down Expand Up @@ -327,7 +321,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.5)
logger (1.6.6)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -352,18 +346,18 @@ GEM
multipart-post (2.4.1)
mustache (1.1.1)
mutex_m (0.3.0)
net-imap (0.5.5)
net-imap (0.5.6)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.5.0)
net-smtp (0.5.1)
net-protocol
netrc (0.11.0)
nio4r (2.7.4)
nokogiri (1.18.2-x86_64-linux-gnu)
nokogiri (1.18.3-x86_64-linux-gnu)
racc (~> 1.4)
onebox (2.2.19)
addressable (~> 2.8.0)
Expand Down Expand Up @@ -415,7 +409,7 @@ GEM
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.8.1)
rack (2.2.10)
rack (2.2.11)
rack-proxy (0.7.7)
rack
rack-session (1.0.2)
Expand All @@ -425,20 +419,20 @@ GEM
rackup (1.0.1)
rack (< 3)
webrick
rails (7.1.5.1)
actioncable (= 7.1.5.1)
actionmailbox (= 7.1.5.1)
actionmailer (= 7.1.5.1)
actionpack (= 7.1.5.1)
actiontext (= 7.1.5.1)
actionview (= 7.1.5.1)
activejob (= 7.1.5.1)
activemodel (= 7.1.5.1)
activerecord (= 7.1.5.1)
activestorage (= 7.1.5.1)
activesupport (= 7.1.5.1)
rails (7.2.2.1)
actioncable (= 7.2.2.1)
actionmailbox (= 7.2.2.1)
actionmailer (= 7.2.2.1)
actionpack (= 7.2.2.1)
actiontext (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activemodel (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
bundler (>= 1.15.0)
railties (= 7.1.5.1)
railties (= 7.2.2.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -456,10 +450,10 @@ GEM
railties (>= 6.0.0, < 8)
rails_gravatar (1.0.4)
actionview
railties (7.1.5.1)
actionpack (= 7.1.5.1)
activesupport (= 7.1.5.1)
irb
railties (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand All @@ -469,7 +463,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.11.0)
rdoc (6.12.0)
psych (>= 4.0.0)
redis-client (0.23.2)
connection_pool
Expand All @@ -486,7 +480,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.4.0)
rexml (3.4.1)
rgl (0.6.6)
pairing_heap (>= 0.3, < 4.0)
rexml (~> 3.2, >= 3.2.4)
Expand Down Expand Up @@ -602,7 +596,7 @@ GEM
stream (0.5.5)
streamio-ffmpeg (3.0.2)
multi_json (~> 1.8)
stringio (3.1.2)
stringio (3.1.5)
sunspot (2.7.1)
bigdecimal
pr_geohash (~> 1.0)
Expand Down Expand Up @@ -636,6 +630,7 @@ GEM
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
useragent (0.16.11)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.1)
Expand All @@ -654,7 +649,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (4.0.1)
zeitwerk (2.6.18)
zeitwerk (2.7.2)

PLATFORMS
x86_64-linux
Expand All @@ -676,6 +671,7 @@ DEPENDENCIES
coffee-rails (~> 5.0)
commontator (~> 7.0.1)
coveralls (~> 0.7)
csv (~> 3.3)
dalli (~> 3.2)
database_cleaner-active_record (~> 2.2)
devise (~> 4.9)
Expand All @@ -700,6 +696,7 @@ DEPENDENCIES
marcel (~> 1.0)
mini_magick (~> 4.13)
mobility (~> 1.2)
mutex_m (~> 0.3)
net-smtp (~> 0.5)
pdf-reader (~> 2.12)
pg (~> 1.5)
Expand All @@ -709,7 +706,7 @@ DEPENDENCIES
prometheus_exporter (~> 2.1)
puma (~> 6.4)
rack (~> 2.2)
rails (~> 7.1.3)
rails (~> 7.2.2)
rails-erd (~> 1.7)
rails-i18n (~> 7.0)
responders (~> 3.1)
Expand Down Expand Up @@ -743,7 +740,7 @@ DEPENDENCIES
webpacker (~> 5.4)

RUBY VERSION
ruby 3.1.4p223
ruby 3.3.7p123

BUNDLED WITH
2.6.3
4 changes: 2 additions & 2 deletions app/helpers/email_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module EmailHelper
def email_image_tag(image, **options)
def email_image_tag(image, **)
attachments.inline[image] = Rails.root.join("public/#{image}").read
image_tag(attachments[image].url, **options)
image_tag(attachments[image].url, **)
end
end
Loading