diff --git a/.github/workflows/erd.yml b/.github/workflows/erd.yml index fd366fb9dc..025520e90f 100644 --- a/.github/workflows/erd.yml +++ b/.github/workflows/erd.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.0 + ruby-version: 3.2.1 - name: Set up Node uses: actions/setup-node@v4 diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index f13b348ee1..f9c1213ea3 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.0 + ruby-version: 3.2.1 - uses: actions/cache@v4 with: path: cosmetics-web/vendor/bundle diff --git a/.github/workflows/smoke_test.yml b/.github/workflows/smoke_test.yml index 3e843912b6..ec434332f5 100644 --- a/.github/workflows/smoke_test.yml +++ b/.github/workflows/smoke_test.yml @@ -40,7 +40,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.0 + ruby-version: 3.2.1 - name: Set up Node uses: actions/setup-node@v4 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 10cf6d71b7..8b8259c9b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.0 + ruby-version: 3.2.1 - name: Set up Node uses: actions/setup-node@v4 with: diff --git a/cosmetics-web/.ruby-version b/cosmetics-web/.ruby-version index 944880fa15..e4604e3afd 100644 --- a/cosmetics-web/.ruby-version +++ b/cosmetics-web/.ruby-version @@ -1 +1 @@ -3.2.0 +3.2.1 diff --git a/cosmetics-web/Dockerfile b/cosmetics-web/Dockerfile index 6094069c9f..a0f3fe41e0 100644 --- a/cosmetics-web/Dockerfile +++ b/cosmetics-web/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.0 +FROM ruby:3.2.1 ENV LANG C.UTF-8 ENV DEBIAN_FRONTEND noninteractive diff --git a/cosmetics-web/Gemfile b/cosmetics-web/Gemfile index 36b268dd89..a066b976fd 100644 --- a/cosmetics-web/Gemfile +++ b/cosmetics-web/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "~> 3.2.0" +ruby "~> 3.2.1" gem "kaminari" # Must be loaded before ElasticSearch gems @@ -37,7 +37,7 @@ gem "paper_trail", "~> 15.2" gem "pg", "~> 1.5" gem "puma", "~> 6.4" gem "pundit", "~> 2.3" -gem "rails", "7.1.2" +gem "rails", "7.1.4.1" gem "redis", "~> 5.2" gem "request_store", "~> 1.6" gem "rest-client", "~> 2.1" diff --git a/cosmetics-web/Gemfile.lock b/cosmetics-web/Gemfile.lock index 39ea2e0848..39583665da 100644 --- a/cosmetics-web/Gemfile.lock +++ b/cosmetics-web/Gemfile.lock @@ -22,35 +22,35 @@ GEM specs: aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + actioncable (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) 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) + actionmailbox (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) + actionmailer (7.1.4.1) + actionpack (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.2) - actionview (= 7.1.2) - activesupport (= 7.1.2) + actionpack (7.1.4.1) + actionview (= 7.1.4.1) + activesupport (= 7.1.4.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -58,15 +58,15 @@ GEM rack-test (>= 0.6.3) 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) + actiontext (7.1.4.1) + actionpack (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.1.4.1) + activesupport (= 7.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -74,22 +74,22 @@ GEM active_record_extended (3.3.0) activerecord (>= 5.2, < 8.0.0) pg (< 3.0) - activejob (7.1.2) - activesupport (= 7.1.2) + activejob (7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.3.6) - activemodel (7.1.2) - activesupport (= 7.1.2) - activerecord (7.1.2) - activemodel (= 7.1.2) - activesupport (= 7.1.2) + activemodel (7.1.4.1) + activesupport (= 7.1.4.1) + activerecord (7.1.4.1) + activemodel (= 7.1.4.1) + activesupport (= 7.1.4.1) timeout (>= 0.4.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) + activestorage (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activesupport (= 7.1.4.1) marcel (~> 1.0) - activesupport (7.1.2) + activesupport (7.1.4.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -381,20 +381,20 @@ GEM 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) + rails (7.1.4.1) + actioncable (= 7.1.4.1) + actionmailbox (= 7.1.4.1) + actionmailer (= 7.1.4.1) + actionpack (= 7.1.4.1) + actiontext (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activemodel (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) bundler (>= 1.15.0) - railties (= 7.1.2) + railties (= 7.1.4.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -411,9 +411,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + railties (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -683,7 +683,7 @@ DEPENDENCIES pry-byebug puma (~> 6.4) pundit (~> 2.3) - rails (= 7.1.2) + rails (= 7.1.4.1) rails-controller-testing rails-erd redis (~> 5.2) @@ -723,7 +723,7 @@ DEPENDENCIES wicked (~> 2.0) RUBY VERSION - ruby 3.2.0 + ruby 3.2.1p31 BUNDLED WITH 2.4.4 diff --git a/cosmetics-web/support_portal/Gemfile b/cosmetics-web/support_portal/Gemfile index 6cdc7edf3a..2d1d9feb73 100644 --- a/cosmetics-web/support_portal/Gemfile +++ b/cosmetics-web/support_portal/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.2.0" +ruby "3.2.1" # Specify your gem's dependencies in support_portal.gemspec. gemspec diff --git a/cosmetics-web/support_portal/Gemfile.lock b/cosmetics-web/support_portal/Gemfile.lock index 187dcd45b8..68d80ae8c5 100644 --- a/cosmetics-web/support_portal/Gemfile.lock +++ b/cosmetics-web/support_portal/Gemfile.lock @@ -243,7 +243,7 @@ DEPENDENCIES support_portal! RUBY VERSION - ruby 3.2.0p0 + ruby 3.2.1p31 BUNDLED WITH 2.4.4