Skip to content

Commit

Permalink
bump rails to 7.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@vol1ura
vol1ura committed Dec 20, 2023
1 parent 3a7cd9b commit 0c3438b
Show file tree
Hide file tree
Showing 19 changed files with 251 additions and 177 deletions.
2 changes: 1 addition & 1 deletion Capfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require 'capistrano/sitemap_generator'
require 'whenever/capistrano'

install_plugin Capistrano::Puma
install_plugin Capistrano::Puma::Nginx
# install_plugin Capistrano::Puma::Nginx
install_plugin Capistrano::Puma::Systemd
install_plugin Capistrano::Sidekiq
install_plugin Capistrano::Sidekiq::Systemd
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

ruby '3.2.2'

gem 'rails', '~> 7.0.4'
gem 'rails', '~> 7.1.2'

gem 'activeadmin'
gem 'activeadmin_quill_editor'
Expand Down Expand Up @@ -65,7 +65,7 @@ group :development do

# Deploy
gem 'capistrano', '~> 3.17', require: false
gem 'capistrano3-puma', require: false
gem 'capistrano3-puma', '6.0.0.beta.1', require: false
gem 'capistrano-rails', '~> 1.6', require: false
gem 'capistrano-rbenv', '~> 2.2', require: false
gem 'capistrano-sidekiq', '~> 2.3', require: false
Expand Down
190 changes: 111 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,55 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
zeitwerk (~> 2.6)
actionmailbox (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8)
actionpack (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activesupport (= 7.0.8)
actionmailer (7.1.2)
actionpack (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activesupport (= 7.1.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.2)
actionview (= 7.1.2)
activesupport (= 7.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.2)
actionpack (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.1.2)
activesupport (= 7.1.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activeadmin (3.1.0)
arbre (~> 1.2, >= 1.2.1)
formtastic (>= 3.1)
Expand All @@ -57,25 +61,30 @@ GEM
ransack (>= 4.0)
activeadmin_quill_editor (1.1.0)
activeadmin (>= 2.0, < 4)
activejob (7.0.8)
activesupport (= 7.0.8)
activejob (7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activesupport (= 7.0.8)
activemodel (7.1.2)
activesupport (= 7.1.2)
activerecord (7.1.2)
activemodel (= 7.1.2)
activesupport (= 7.1.2)
timeout (>= 0.4.0)
activestorage (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activesupport (= 7.1.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
Expand All @@ -91,8 +100,10 @@ GEM
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
barby (0.6.8)
bcrypt (3.1.18)
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt_pbkdf (1.1.0)
bigdecimal (3.1.5)
bootsnap (1.17.0)
msgpack (~> 1.2)
bootstrap (5.3.2)
Expand Down Expand Up @@ -126,10 +137,10 @@ GEM
capistrano (>= 3.9.0)
capistrano-bundler
sidekiq (>= 6.0)
capistrano3-puma (5.2.0)
capistrano3-puma (6.0.0.beta.1)
capistrano (~> 3.7)
capistrano-bundler
puma (>= 4.0, < 6.0)
puma (>= 5.1, < 7.0)
chronic (0.10.2)
coderay (1.1.3)
concurrent-ruby (1.2.2)
Expand All @@ -141,16 +152,18 @@ GEM
database_consistency (1.7.21)
activerecord (>= 3.2)
date (3.3.4)
devise (4.8.1)
devise (4.9.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-i18n (1.10.3)
devise (>= 4.8.0)
devise-i18n (1.12.0)
devise (>= 4.9.0)
diff-lcs (1.5.0)
docile (1.4.0)
drb (2.2.0)
ruby2_keywords
ed25519 (1.3.0)
erubi (1.12.0)
execjs (2.9.1)
Expand All @@ -171,8 +184,8 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
hashdiff (1.0.1)
hiredis-client (0.17.0)
redis-client (= 0.17.0)
hiredis-client (0.19.0)
redis-client (= 0.19.0)
hotwire-rails (0.1.3)
rails (>= 6.0.0)
stimulus-rails
Expand All @@ -188,6 +201,10 @@ GEM
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
io-console (0.7.1)
irb (1.11.0)
rdoc
reline (>= 0.3.8)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -223,7 +240,8 @@ GEM
mini_portile2 (2.8.5)
minitest (5.20.0)
msgpack (1.7.2)
net-imap (0.4.7)
mutex_m (0.2.0)
net-imap (0.4.8)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -261,29 +279,36 @@ GEM
yard (~> 0.9.11)
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (5.1.2)
stringio
public_suffix (5.0.3)
puma (5.6.7)
puma (6.4.0)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
rack (3.0.8)
rack-mini-profiler (3.3.0)
rack (>= 1.2.0)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8)
actioncable (= 7.0.8)
actionmailbox (= 7.0.8)
actionmailer (= 7.0.8)
actionpack (= 7.0.8)
actiontext (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activemodel (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.2)
actioncable (= 7.1.2)
actionmailbox (= 7.1.2)
actionmailer (= 7.1.2)
actionpack (= 7.1.2)
actiontext (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activemodel (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.1.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -296,26 +321,31 @@ GEM
railties
redis
redis-namespace
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
method_source
railties (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
ransack (4.1.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
rdoc (6.6.2)
psych (>= 4.0.0)
redis (5.0.8)
redis-client (>= 0.17.0)
redis-client (0.17.0)
redis-client (0.19.0)
connection_pool
redis-namespace (1.11.0)
redis (>= 4)
regexp_parser (2.8.2)
reline (0.4.1)
io-console (~> 0.5)
request_store (1.5.1)
rack (>= 1.4)
responders (3.1.1)
Expand Down Expand Up @@ -380,7 +410,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sidekiq (7.1.3)
sidekiq (7.2.0)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
Expand All @@ -405,6 +435,7 @@ GEM
net-ssh (>= 2.8.0)
stimulus-rails (1.1.0)
railties (>= 6.0.0)
stringio (3.1.0)
thor (1.3.0)
tilt (2.3.0)
timeout (0.4.1)
Expand All @@ -423,6 +454,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -453,7 +485,7 @@ DEPENDENCIES
capistrano-rails (~> 1.6)
capistrano-rbenv (~> 2.2)
capistrano-sidekiq (~> 2.3)
capistrano3-puma
capistrano3-puma (= 6.0.0.beta.1)
dalli
database_consistency
devise (~> 4.8)
Expand All @@ -472,7 +504,7 @@ DEPENDENCIES
pry-rails
puma
rack-mini-profiler
rails (~> 7.0.4)
rails (~> 7.1.2)
rails_performance
redis
rollbar
Expand Down
2 changes: 1 addition & 1 deletion bin/setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require "fileutils"
APP_ROOT = File.expand_path("..", __dir__)

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
system(*args, exception: true)
end

FileUtils.chdir APP_ROOT do
Expand Down
Loading

0 comments on commit 0c3438b

Please # to comment.