Skip to content

Commit

Permalink
Merge pull request #197 from splaplapla/use-trilogy
Browse files Browse the repository at this point in the history 
Upgrade gems
  • Loading branch information
@jiikko
jiikko authored Apr 22, 2024
2 parents 4f52313 + f8578ff commit 10493ce
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 73 deletions.
5 changes: 3 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.2'

gem 'rails', "7.0.7.1"
gem 'mysql2'
gem 'rails', "7.0.8.1"
# gem "trilogy"
gem "mysql2"
gem 'puma'
gem 'cssbundling-rails'
gem 'importmap-rails'
Expand Down
142 changes: 71 additions & 71 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,67 @@ GEM
specs:
action_cable_client (3.1.0)
websocket-eventmachine-client (>= 1.2.0)
actioncable (7.0.7.1)
actionpack (= 7.0.7.1)
activesupport (= 7.0.7.1)
actioncable (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.7.1)
actionpack (= 7.0.7.1)
activejob (= 7.0.7.1)
activerecord (= 7.0.7.1)
activestorage (= 7.0.7.1)
activesupport (= 7.0.7.1)
actionmailbox (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.7.1)
actionpack (= 7.0.7.1)
actionview (= 7.0.7.1)
activejob (= 7.0.7.1)
activesupport (= 7.0.7.1)
actionmailer (7.0.8.1)
actionpack (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.7.1)
actionview (= 7.0.7.1)
activesupport (= 7.0.7.1)
actionpack (7.0.8.1)
actionview (= 7.0.8.1)
activesupport (= 7.0.8.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.7.1)
actionpack (= 7.0.7.1)
activerecord (= 7.0.7.1)
activestorage (= 7.0.7.1)
activesupport (= 7.0.7.1)
actiontext (7.0.8.1)
actionpack (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.7.1)
activesupport (= 7.0.7.1)
actionview (7.0.8.1)
activesupport (= 7.0.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.7.1)
activesupport (= 7.0.7.1)
activejob (7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.3.6)
activemodel (7.0.7.1)
activesupport (= 7.0.7.1)
activerecord (7.0.7.1)
activemodel (= 7.0.7.1)
activesupport (= 7.0.7.1)
activestorage (7.0.7.1)
actionpack (= 7.0.7.1)
activejob (= 7.0.7.1)
activerecord (= 7.0.7.1)
activesupport (= 7.0.7.1)
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activestorage (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activesupport (= 7.0.8.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.7.1)
activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -87,7 +87,7 @@ GEM
byebug (11.1.3)
chartkick (5.0.2)
coderay (1.1.3)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crass (1.0.6)
cssbundling-rails (1.2.0)
Expand All @@ -110,7 +110,7 @@ GEM
globalid (1.2.1)
activesupport (>= 6.1)
hashie (5.0.0)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
importmap-rails (1.2.1)
actionpack (>= 6.0.0)
Expand Down Expand Up @@ -143,31 +143,31 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
marcel (1.0.4)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
mini_portile2 (2.8.6)
minitest (5.22.3)
mock_redis (0.36.0)
ruby2_keywords
msgpack (1.7.1)
multi_xml (0.6.0)
mysql2 (0.5.5)
net-imap (0.4.8)
mysql2 (0.5.6)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.5.0)
net-protocol
newrelic_rpm (9.2.2)
nio4r (2.7.0)
nokogiri (1.15.5)
nio4r (2.7.1)
nokogiri (1.16.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.5-arm64-darwin)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
oauth (1.1.0)
oauth-tty (~> 1.0, >= 1.0.1)
Expand Down Expand Up @@ -221,44 +221,44 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (5.0.1)
puma (6.4.0)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
rack (2.2.9)
rack-protection (3.0.6)
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.7.1)
actioncable (= 7.0.7.1)
actionmailbox (= 7.0.7.1)
actionmailer (= 7.0.7.1)
actionpack (= 7.0.7.1)
actiontext (= 7.0.7.1)
actionview (= 7.0.7.1)
activejob (= 7.0.7.1)
activemodel (= 7.0.7.1)
activerecord (= 7.0.7.1)
activestorage (= 7.0.7.1)
activesupport (= 7.0.7.1)
rails (7.0.8.1)
actioncable (= 7.0.8.1)
actionmailbox (= 7.0.8.1)
actionmailer (= 7.0.8.1)
actionpack (= 7.0.8.1)
actiontext (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activemodel (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
bundler (>= 1.15.0)
railties (= 7.0.7.1)
railties (= 7.0.8.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.7.1)
actionpack (= 7.0.7.1)
activesupport (= 7.0.7.1)
railties (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -319,7 +319,7 @@ GEM
set (~> 1.0)
stimulus-rails (1.2.1)
railties (>= 6.0.0)
thor (1.3.0)
thor (1.3.1)
timecop (0.9.6)
timeout (0.4.1)
tzinfo (2.0.6)
Expand All @@ -338,7 +338,7 @@ GEM
websocket-eventmachine-base (~> 1.0)
websocket-extensions (0.1.5)
websocket-native (1.0.0)
zeitwerk (2.6.12)
zeitwerk (2.6.13)

PLATFORMS
arm64-darwin-20
Expand Down Expand Up @@ -371,7 +371,7 @@ DEPENDENCIES
pry
pry-rails
puma
rails (= 7.0.7.1)
rails (= 7.0.8.1)
redis
redis-namespace
rmagick
Expand Down

0 comments on commit 10493ce

Please sign in to comment.