Merge pull request #2922 from hennevogel/update/rails7

Welcome to Rails 7 by default
This commit is contained in:
Henne Vogelsang 2022-02-24 16:36:33 +01:00 committed by GitHub
commit 4e9f60a85b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 179 additions and 142 deletions

View file

@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1
ruby-version: 3.1.0
bundler-cache: true
- name: Prepare spec
run: |

View file

@ -14,9 +14,9 @@ end
# as web framework
if next?
gem 'rails', '~> 7'
gem 'rails', '~> 7.1'
else
gem 'rails', '~> 5.2'
gem 'rails', '~> 7.0'
end
# Use Puma as the app server

View file

@ -1,16 +1,16 @@
GEM
remote: https://rails-assets.org/
specs:
rails-assets-bootstrap (3.3.6)
rails-assets-jquery (>= 1.9.1, < 3)
rails-assets-bootstrap (3.4.1)
rails-assets-jquery (>= 1.9.1, < 4)
rails-assets-bootstrap-markdown (2.10.0)
rails-assets-bootstrap (~> 3)
rails-assets-bootstrap-select (1.13.3)
rails-assets-bootstrap-select (1.13.10)
rails-assets-bootstrap (>= 3.0.0)
rails-assets-jquery (>= 1.9.1, < 4)
rails-assets-date.format (1.2.3)
rails-assets-holderjs (2.9.6)
rails-assets-jquery (2.2.4)
rails-assets-jquery (3.4.1)
rails-assets-jquery-smooth-scroll (2.2.0)
rails-assets-jquery (>= 1.7.0)
rails-assets-markdown (0.5.0)
@ -26,68 +26,91 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
actioncable (5.2.6)
actionpack (= 5.2.6)
actioncable (7.0.1)
actionpack (= 7.0.1)
activesupport (= 7.0.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
actionmailbox (7.0.1)
actionpack (= 7.0.1)
activejob (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.1)
actionpack (= 7.0.1)
actionview (= 7.0.1)
activejob (= 7.0.1)
activesupport (= 7.0.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
rack (~> 2.0, >= 2.0.8)
actionpack (7.0.1)
actionview (= 7.0.1)
activesupport (= 7.0.1)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6)
activesupport (= 5.2.6)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.1)
actionpack (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.1)
activesupport (= 7.0.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.10.12)
actionpack (>= 4.1, < 6.2)
activemodel (>= 4.1, < 6.2)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_model_serializers (0.10.13)
actionpack (>= 4.1, < 7.1)
activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.6)
activesupport (= 5.2.6)
activejob (7.0.1)
activesupport (= 7.0.1)
globalid (>= 0.3.6)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
arel (>= 9.0)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
marcel (~> 1.0.0)
activesupport (5.2.6)
activemodel (7.0.1)
activesupport (= 7.0.1)
activerecord (7.0.1)
activemodel (= 7.0.1)
activesupport (= 7.0.1)
activestorage (7.0.1)
actionpack (= 7.0.1)
activejob (= 7.0.1)
activerecord (= 7.0.1)
activesupport (= 7.0.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_commentable_with_threading (2.0.1)
activerecord (>= 4.0)
activesupport (>= 4.0)
awesome_nested_set (>= 3.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
acts_as_commentable_with_threading (1.2.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
awesome_nested_set (>= 2.0)
acts_as_list (1.0.4)
activerecord (>= 4.2)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
ajax-datatables-rails (0.4.3)
railties (>= 4.0)
ajax-datatables-rails (1.3.1)
zeitwerk
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
ast (2.4.2)
autoprefixer-rails (10.3.3.0)
autoprefixer-rails (10.3.1.0)
execjs (~> 2)
awesome_nested_set (3.5.0)
activerecord (>= 4.0.0, < 7.1)
@ -138,7 +161,7 @@ GEM
chronic (0.10.2)
chunky_png (1.4.0)
climate_control (1.0.1)
cloudinary (1.21.0)
cloudinary (1.20.0)
aws_cf_signer
rest-client (>= 2.0.0)
cocoon (1.2.15)
@ -155,7 +178,7 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
daemons (1.4.1)
daemons (1.4.0)
dalli (2.7.11)
dante (0.2.0)
database_cleaner (2.0.1)
@ -164,10 +187,10 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
delayed_job (4.1.9)
activesupport (>= 3.0, < 6.2)
delayed_job_active_record (4.1.6)
activerecord (>= 3.0, < 6.2)
delayed_job (4.1.10)
activesupport (>= 3.0, < 8.0)
delayed_job_active_record (4.1.7)
activerecord (>= 3.0, < 8.0)
delayed_job (>= 3.0, < 5)
devise (4.8.1)
bcrypt (~> 3.0)
@ -178,6 +201,7 @@ GEM
devise_ichain_authenticatable (0.3.2)
devise (>= 2.2)
diff-lcs (1.4.4)
digest (3.1.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
@ -193,9 +217,9 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (1.9.3)
i18n (>= 0.7)
faraday (1.7.2)
faker (2.18.0)
i18n (>= 1.6, < 2)
faraday (1.7.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@ -216,13 +240,13 @@ GEM
faraday-rack (1.0.0)
fastimage (2.2.5)
feature (1.4.0)
ffi (1.15.4)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
ffi (1.15.3)
font-awesome-rails (4.7.0.8)
railties (>= 3.2, < 8.0)
geckodriver-helper (0.24.0)
archive-zip (~> 0.7)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
gravtastic (3.2.6)
haml (5.2.2)
temple (>= 0.8.0)
@ -261,6 +285,7 @@ GEM
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-like (0.3.1)
io-wait (0.2.1)
iso-639 (0.3.5)
jquery-datatables-rails (3.4.0)
actionpack (>= 3.1)
@ -284,10 +309,11 @@ GEM
rails (>= 4.2.0)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (1.4.0)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
letter_opener_web (2.0.0)
actionmailer (>= 5.2)
letter_opener (~> 1.7)
railties (>= 5.2)
rexml
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
@ -298,12 +324,12 @@ GEM
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901)
mime-types-data (3.2021.0704)
mina (1.2.4)
open4 (~> 1.3.4)
rake
mini_magick (4.11.0)
mini_mime (1.1.1)
mini_mime (1.1.2)
mini_portile2 (2.7.1)
minitest (5.15.0)
momentjs-rails (2.20.1)
@ -321,6 +347,21 @@ GEM
multi_xml (0.6.0)
multipart-post (2.1.1)
mysql2 (0.5.3)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.2)
io-wait
timeout
net-smtp (0.3.1)
digest
net-protocol
timeout
netrc (0.11.0)
next_rails (1.0.4)
colorize (>= 0.8.1)
@ -388,7 +429,7 @@ GEM
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
public_suffix (4.0.6)
puma (4.3.9)
puma (4.3.8)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
@ -399,19 +440,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
bundler (>= 1.3.0)
railties (= 5.2.6)
sprockets-rails (>= 2.0.0)
rails (7.0.1)
actioncable (= 7.0.1)
actionmailbox (= 7.0.1)
actionmailer (= 7.0.1)
actionpack (= 7.0.1)
actiontext (= 7.0.1)
actionview (= 7.0.1)
activejob (= 7.0.1)
activemodel (= 7.0.1)
activerecord (= 7.0.1)
activestorage (= 7.0.1)
activesupport (= 7.0.1)
bundler (>= 1.15.0)
railties (= 7.0.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@ -421,21 +463,19 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails-i18n (5.1.3)
rails-i18n (7.0.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
railties (>= 6.0.0, < 8)
railties (7.0.1)
actionpack (= 7.0.1)
activesupport (= 7.0.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
recaptcha (4.14.0)
recaptcha (5.8.1)
json
redcarpet (3.5.1)
regexp_parser (2.2.0)
@ -451,31 +491,31 @@ GEM
netrc (~> 0.8)
rexml (3.2.5)
rolify (6.0.0)
rqrcode (2.1.0)
rqrcode (2.0.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
rqrcode_core (1.1.0)
rspec-activemodel-mocks (1.1.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rspec-support (~> 3.10.0)
rspec-rails (5.0.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.2)
rubocop (1.25.1)
parallel (~> 1.10)
parser (>= 3.1.0.0)
@ -498,33 +538,30 @@ GEM
ruby-openid (2.9.2)
ruby-progressbar (1.11.0)
ruby-rc4 (0.1.5)
ruby-vips (2.1.3)
ruby-vips (2.1.2)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
ruby_parser (3.17.0)
sexp_processor (~> 4.15, >= 4.15.1)
rubyzip (2.3.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.1.0)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selectize-rails (0.12.6)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-rails (4.7.1)
sentry-rails (4.6.5)
railties (>= 5.0)
sentry-ruby-core (~> 4.7.0)
sentry-ruby-core (4.7.2)
sentry-ruby-core (~> 4.6.0)
sentry-ruby-core (4.6.5)
concurrent-ruby
faraday
sexp_processor (4.15.3)
@ -539,13 +576,11 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.3)
sixarm_ruby_unaccent (1.2.0)
skylight (3.1.5)
skylight-core (= 3.1.5)
skylight-core (3.1.5)
activesupport (>= 4.2.0)
skylight (5.1.0)
activesupport (>= 5.2.0)
sort_alphabetical (1.1.0)
unicode_utils (>= 1.2.2)
sprockets (3.7.2)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
@ -554,24 +589,25 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
ssrf_filter (1.0.7)
stripe (5.38.0)
stripe (5.43.0)
stripe-ruby-mock (3.1.0.rc3)
dante (>= 0.2.0)
multi_json (~> 1.0)
stripe (> 5, < 6)
strscan (3.0.1)
sysexits (1.2.0)
temple (0.8.2)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
timecop (0.9.4)
timeout (0.2.0)
transitions (1.2.1)
ttfunk (1.7.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
@ -583,17 +619,17 @@ GEM
railties
warden (1.2.9)
rack (>= 2.0.9)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
web-console (4.1.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webdrivers (4.6.1)
railties (>= 6.0.0)
webdrivers (4.6.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (>= 3.0, < 4.0)
webmock (3.13.0)
addressable (>= 2.3.6)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.5)
@ -603,6 +639,7 @@ GEM
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.5.4)
PLATFORMS
ruby
@ -672,7 +709,7 @@ DEPENDENCIES
prawn-qrcode
prawn-rails
puma (~> 4.3)
rails (~> 5.2)
rails (~> 7.0)
rails-assets-bootstrap-markdown!
rails-assets-bootstrap-select!
rails-assets-date.format!