erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Use rails version 7.2.0.beta3

Browse source
This commit is contained in:
Matt Jankowski 2024-06-06 10:52:27 -04:00
parent 2c1e75727d
commit 392657f545
2 changed files with 75 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -6,7 +6,7 @@ ruby '>= 3.1.0'
gem 'propshaft' gem 'propshaft'
gem 'puma', '~> 6.3' gem 'puma', '~> 6.3'
gem 'rack', '~> 2.2.7' gem 'rack', '~> 2.2.7'
gem 'rails', '~> 7.1.1' gem 'rails', '7.2.0.beta3'
gem 'thor', '~> 1.2' gem 'thor', '~> 1.2'
gem 'dotenv' gem 'dotenv'
@ -63,6 +63,7 @@ gem 'kaminari', '~> 1.2'
gem 'link_header', '~> 0.0' gem 'link_header', '~> 0.0'
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar' gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
gem 'mutex_m'
gem 'nokogiri', '~> 1.15' gem 'nokogiri', '~> 1.15'
gem 'nsa' gem 'nsa'
gem 'oj', '~> 3.14' gem 'oj', '~> 3.14'
@ -141,7 +142,7 @@ group :test do
gem 'selenium-webdriver' gem 'selenium-webdriver'
# Used to reset the database between system tests # Used to reset the database between system tests
gem 'database_cleaner-active_record' gem 'database_cleaner-active_record', github: 'DatabaseCleaner/database_cleaner-active_record' # TODO: Release version?
# Used to mock environment variables # Used to mock environment variables
gem 'climate_control' gem 'climate_control'

142
Gemfile.lock
View file

@ -7,38 +7,40 @@ GIT
hkdf (~> 0.2) hkdf (~> 0.2)
jwt (~> 2.0) jwt (~> 2.0)
GIT
remote: https://github.com/DatabaseCleaner/database_cleaner-active_record.git
revision: 79b08760d66369f43c40c49cc845a68ea9727e6e
specs:
database_cleaner-active_record (2.1.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.1.3.4) actioncable (7.2.0.beta3)
actionpack (= 7.1.3.4) actionpack (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (7.1.3.4) actionmailbox (7.2.0.beta3)
actionpack (= 7.1.3.4) actionpack (= 7.2.0.beta3)
activejob (= 7.1.3.4) activejob (= 7.2.0.beta3)
activerecord (= 7.1.3.4) activerecord (= 7.2.0.beta3)
activestorage (= 7.1.3.4) activestorage (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
mail (>= 2.7.1) mail (>= 2.8.0)
net-imap actionmailer (7.2.0.beta3)
net-pop actionpack (= 7.2.0.beta3)
net-smtp actionview (= 7.2.0.beta3)
actionmailer (7.1.3.4) activejob (= 7.2.0.beta3)
actionpack (= 7.1.3.4) activesupport (= 7.2.0.beta3)
actionview (= 7.1.3.4) mail (>= 2.8.0)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (7.1.3.4) actionpack (7.2.0.beta3)
actionview (= 7.1.3.4) actionview (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
racc racc
rack (>= 2.2.4) rack (>= 2.2.4)
@ -46,15 +48,16 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4) useragent (~> 0.16)
actionpack (= 7.1.3.4) actiontext (7.2.0.beta3)
activerecord (= 7.1.3.4) actionpack (= 7.2.0.beta3)
activestorage (= 7.1.3.4) activerecord (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activestorage (= 7.2.0.beta3)
activesupport (= 7.2.0.beta3)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.1.3.4) actionview (7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
@ -64,31 +67,31 @@ GEM
activemodel (>= 4.1) activemodel (>= 4.1)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (7.1.3.4) activejob (7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.1.3.4) activemodel (7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
activerecord (7.1.3.4) activerecord (7.2.0.beta3)
activemodel (= 7.1.3.4) activemodel (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (7.1.3.4) activestorage (7.2.0.beta3)
actionpack (= 7.1.3.4) actionpack (= 7.2.0.beta3)
activejob (= 7.1.3.4) activejob (= 7.2.0.beta3)
activerecord (= 7.1.3.4) activerecord (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (7.1.3.4) activesupport (7.2.0.beta3)
base64 base64
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5) connection_pool (>= 2.2.5)
drb drb
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1) minitest (>= 5.1)
mutex_m tzinfo (~> 2.0, >= 2.0.5)
tzinfo (~> 2.0)
addressable (2.8.7) addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0) public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0) aes_key_wrap (1.1.0)
@ -180,9 +183,6 @@ GEM
css_parser (1.17.1) css_parser (1.17.1)
addressable addressable
csv (3.3.0) csv (3.3.0)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1) database_cleaner-core (2.0.1)
date (3.3.4) date (3.3.4)
debug (1.9.2) debug (1.9.2)
@ -638,20 +638,20 @@ GEM
rackup (1.0.0) rackup (1.0.0)
rack (< 3) rack (< 3)
webrick webrick
rails (7.1.3.4) rails (7.2.0.beta3)
actioncable (= 7.1.3.4) actioncable (= 7.2.0.beta3)
actionmailbox (= 7.1.3.4) actionmailbox (= 7.2.0.beta3)
actionmailer (= 7.1.3.4) actionmailer (= 7.2.0.beta3)
actionpack (= 7.1.3.4) actionpack (= 7.2.0.beta3)
actiontext (= 7.1.3.4) actiontext (= 7.2.0.beta3)
actionview (= 7.1.3.4) actionview (= 7.2.0.beta3)
activejob (= 7.1.3.4) activejob (= 7.2.0.beta3)
activemodel (= 7.1.3.4) activemodel (= 7.2.0.beta3)
activerecord (= 7.1.3.4) activerecord (= 7.2.0.beta3)
activestorage (= 7.1.3.4) activestorage (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.1.3.4) railties (= 7.2.0.beta3)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
@ -666,10 +666,10 @@ GEM
rails-i18n (7.0.9) rails-i18n (7.0.9)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 6.0.0, < 8)
railties (7.1.3.4) railties (7.2.0.beta3)
actionpack (= 7.1.3.4) actionpack (= 7.2.0.beta3)
activesupport (= 7.1.3.4) activesupport (= 7.2.0.beta3)
irb irb (~> 1.13)
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0, >= 1.2.2) thor (~> 1.0, >= 1.2.2)
@ -866,6 +866,7 @@ GEM
unf_ext (0.0.9.1) unf_ext (0.0.9.1)
unicode-display_width (2.5.0) unicode-display_width (2.5.0)
uri (0.13.0) uri (0.13.0)
useragent (0.16.10)
validate_email (0.1.6) validate_email (0.1.6)
activemodel (>= 3.0) activemodel (>= 3.0)
mail (>= 2.2.5) mail (>= 2.2.5)
@ -930,7 +931,7 @@ DEPENDENCIES
concurrent-ruby concurrent-ruby
connection_pool connection_pool
csv (~> 3.2) csv (~> 3.2)
database_cleaner-active_record database_cleaner-active_record!
debug (~> 1.8) debug (~> 1.8)
devise (~> 4.9) devise (~> 4.9)
devise-two-factor devise-two-factor
@ -975,6 +976,7 @@ DEPENDENCIES
md-paperclip-azure (~> 2.2) md-paperclip-azure (~> 2.2)
memory_profiler memory_profiler
mime-types (~> 3.5.0) mime-types (~> 3.5.0)
mutex_m
net-http (~> 0.4.0) net-http (~> 0.4.0)
net-ldap (~> 0.18) net-ldap (~> 0.18)
nokogiri (~> 1.15) nokogiri (~> 1.15)
@ -1014,7 +1016,7 @@ DEPENDENCIES
rack-attack (~> 6.6) rack-attack (~> 6.6)
rack-cors (~> 2.0) rack-cors (~> 2.0)
rack-test (~> 2.1) rack-test (~> 2.1)
rails (~> 7.1.1) rails (= 7.2.0.beta3)
rails-controller-testing (~> 1.0) rails-controller-testing (~> 1.0)
rails-i18n (~> 7.0) rails-i18n (~> 7.0)
rdf-normalize (~> 0.5) rdf-normalize (~> 0.5)