Skip to content

Commit 8585857

Browse files
Merge staging into master
2 parents 3509a23 + 9e7b1d0 commit 8585857

31 files changed

Lines changed: 1030 additions & 868 deletions

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Download actionlint
7070
run: |
71-
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.10
71+
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.11
7272
7373
- name: Load test image
7474
uses: guidojw/actions/load-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0

.github/workflows/publish-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Build and push image
6969
id: build_push_image
70-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
70+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
7171
with:
7272
push: true
7373
context: .

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.22.0
1+
24.13.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626
&& rm -rf /var/lib/apt/lists/*
2727

2828
# Add Node, required for asset pipeline.
29-
RUN curl -sL https://deb.nodesource.com/setup_22.x | bash - && \
29+
RUN curl -sL https://deb.nodesource.com/setup_24.x | bash - && \
3030
apt-get install -y nodejs && \
3131
npm install -q -g yarn
3232

Gemfile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
source 'https://rubygems.org'
22

33
gem 'active_model_otp', '~> 2.3', '>= 2.3.4'
4-
gem 'bcrypt', '~> 3.1.20'
5-
gem 'bootsnap', '~> 1.19.0'
4+
gem 'bcrypt', '~> 3.1.21'
5+
gem 'bootsnap', '~> 1.21.1'
66
gem 'browser', '~> 6.2.0'
77
gem 'cssbundling-rails', '~> 1.4', '>= 1.4.3'
88
gem 'dartsass-rails', '~> 0.5.1'
9-
gem 'devise', '~>4.9.4'
9+
gem 'devise', '~>5.0.0'
1010
gem 'devise-i18n', '~>1.15.0'
1111
gem 'factory_bot_rails', '~> 6.5.1'
12-
gem 'faker', '~> 3.5.3'
13-
gem 'grover', '~> 1.2.4'
12+
gem 'faker', '~> 3.6.0'
13+
gem 'grover', '~> 1.2.6'
1414
gem 'http', '~> 5.3.1'
1515
gem 'jbuilder', '~> 2.14.1'
1616
gem 'jquery-rails', '~> 4.6.1'
@@ -25,37 +25,37 @@ gem 'omniauth-identity', '~> 3.1', '>= 3.1.5'
2525
gem 'omniauth-oauth2', '~> 1.9.0'
2626
gem 'paper_trail', '~> 17.0.0'
2727
gem 'paranoia', '~> 3.1.0'
28-
gem 'pg', '~> 1.6.2'
29-
gem 'puma', '~> 7.1.0'
28+
gem 'pg', '~> 1.6.3'
29+
gem 'puma', '~> 7.2.0'
3030
gem 'pundit', '~> 2.5.2'
3131
gem 'rack-attack', '~> 6.8.0'
3232
gem 'rails', '~> 7.2.3'
3333
gem 'rails-i18n', '~> 7.0.10'
3434
gem 'redis', '~> 5.4', '>= 5.4.1'
3535
gem 'rest-client', '~> 2.1.0'
36-
gem 'rqrcode', '~> 3.1', '>= 3.1.1'
37-
gem 'sentry-rails', '~> 6.2'
38-
gem 'sentry-ruby', '~> 6.2'
39-
gem 'sentry-sidekiq', '~> 6.2'
36+
gem 'rqrcode', '~> 3.2'
37+
gem 'sentry-rails', '~> 6.3'
38+
gem 'sentry-ruby', '~> 6.3'
39+
gem 'sentry-sidekiq', '~> 6.3'
4040
gem 'sidekiq', '~> 8.0.10'
4141
gem 'sidekiq-scheduler', '~> 6.0.1'
42-
gem 'simple_form', '~> 5.4.0'
42+
gem 'simple_form', '~> 5.4.1'
4343
gem 'sprockets-rails', '~> 3.5', '>= 3.5.2'
44-
gem 'turbo-rails', '~> 2.0', '>= 2.0.20'
44+
gem 'turbo-rails', '~> 2.0', '>= 2.0.23'
4545
gem 'uglifier', '~> 4.2.1'
4646
gem 'validates_timeliness', '~> 7.1.0'
4747

4848
group :development, :test do
4949
gem 'awesome_print', '~> 1.9.2'
5050
gem 'better_errors', '~> 2.10.1'
51-
gem 'brakeman', '~> 7.1.1', require: false
51+
gem 'brakeman', '~> 8.0.1', require: false
5252
gem 'bullet', '~> 8.1'
5353
gem 'colorize', '~> 1.1.0'
5454
gem 'database_consistency', '~> 2.1.1'
5555
gem 'dotenv-rails', '~> 3.2.0'
5656
gem 'guard-livereload', '~> 2.5.2'
5757
gem 'guard-rspec', '~> 4.7.3', require: false
58-
gem 'pry-byebug', '~> 3.11.0'
58+
gem 'pry-byebug', '~> 3.12.0'
5959
gem 'pry-rails', '~> 0.3.11'
6060
gem 'rb-readline', '~> 0.5.5'
6161
gem 'rspec-rails', '~> 8.0.2'
@@ -64,7 +64,7 @@ end
6464
group :development do
6565
gem 'capistrano-sidekiq', '~> 3.2.0'
6666
gem 'foreman', '~> 0.90.0', require: false
67-
gem 'listen', '~> 3.9.0'
67+
gem 'listen', '~> 3.10.0'
6868
gem 'mina', '~> 1.2.5'
6969
gem 'spring', '~> 4.4.0', require: false
7070
gem 'spring-commands-rspec', '~> 1.0.4', require: false
@@ -74,11 +74,11 @@ end
7474

7575
group :test do
7676
gem 'rails-controller-testing', '~> 1.0.5'
77-
gem 'rubocop', '~> 1.82.1', require: false
77+
gem 'rubocop', '~> 1.84.0', require: false
7878
gem 'rubocop-factory_bot', '~> 2.28.0', require: false
7979
gem 'rubocop-performance', '~> 1.26', '>= 1.26.1', require: false
80-
gem 'rubocop-rails', '~> 2.34', '>= 2.34.2', require: false
81-
gem 'rubocop-rspec', '~> 3.8', require: false
80+
gem 'rubocop-rails', '~> 2.34', '>= 2.34.3', require: false
81+
gem 'rubocop-rspec', '~> 3.9', require: false
8282
gem 'rubocop-rspec_rails', '~> 2.32', require: false
8383
gem 'simplecov', '~> 0.22.0', require: false
8484
gem 'simplecov-lcov', '~> 0.9.0', require: false

0 commit comments

Comments
 (0)