Skip to content

Commit a185f54

Browse files
authored
Merge branch 'master' into add-confirmation-modal
2 parents 2f6bcc0 + 7ca88ee commit a185f54

18 files changed

Lines changed: 848 additions & 53 deletions

File tree

.github/workflows/brakeman.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
# Checkout the repository to the GitHub Actions runner
3333
- name: Checkout
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535

3636
# Customize the ruby version depending on your needs
3737
- name: Setup Ruby

.github/workflows/dependabot-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
auto-merge:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- uses: ahmadnassri/action-dependabot-auto-merge@v2
1313
with:
1414
target: minor

.github/workflows/docker-containers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434
with:
3535
ref: ${{ github.event_name == 'pull_request_target' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
3636
fetch-depth: 1
@@ -80,7 +80,7 @@ jobs:
8080
runs-on: ubuntu-latest
8181
steps:
8282
- name: Checkout
83-
uses: actions/checkout@v5
83+
uses: actions/checkout@v6
8484
with:
8585
ref: ${{ github.event_name == 'pull_request_target' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
8686
fetch-depth: 1
@@ -134,7 +134,7 @@ jobs:
134134
runs-on: ubuntu-latest
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@v5
137+
uses: actions/checkout@v6
138138
with:
139139
ref: ${{ github.event_name == 'pull_request_target' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
140140
fetch-depth: 1

.github/workflows/lint-helm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414

.github/workflows/ruby-tests.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
BUNDLE_WITHOUT: 'development'
2626

2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929

3030
- name: Setup Ruby
3131
uses: ruby/setup-ruby@v1
@@ -77,3 +77,12 @@ jobs:
7777
- name: Run system tests
7878
run: |
7979
bin/rails test:system
80+
81+
- name: Keep screenshots from failed system tests
82+
uses: actions/upload-artifact@v5
83+
if: failure()
84+
with:
85+
name: screenshots
86+
path: ${{ github.workspace }}/tmp/screenshots
87+
if-no-files-found: ignore
88+

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gem "lockbox"
7171
gem "terser", "~> 1.2"
7272
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
7373
gem "bootstrap"
74-
gem "json", "~> 2.16" # Legacy carry-over
74+
gem "json", "~> 2.17" # Legacy carry-over
7575

7676
# Use Redis adapter to run Action Cable in production
7777
# gem 'redis', '~> 4.0'
@@ -115,4 +115,4 @@ gem "turnout2024", require: "turnout"
115115
gem "mission_control-jobs", "~> 1.1.0"
116116
gem "overmind", "~> 2.5", group: :development
117117

118-
gem "dotenv", "~> 3.1"
118+
gem "dotenv", "~> 3.2"

Gemfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ GEM
9090
activesupport (>= 5.0)
9191
ast (2.4.3)
9292
aws-eventstream (1.4.0)
93-
aws-partitions (1.1188.0)
94-
aws-sdk-core (3.239.1)
93+
aws-partitions (1.1190.0)
94+
aws-sdk-core (3.239.2)
9595
aws-eventstream (~> 1, >= 1.3.0)
9696
aws-partitions (~> 1, >= 1.992.0)
9797
aws-sigv4 (~> 1.9)
@@ -102,7 +102,7 @@ GEM
102102
aws-sdk-kms (1.118.0)
103103
aws-sdk-core (~> 3, >= 3.239.1)
104104
aws-sigv4 (~> 1.5)
105-
aws-sdk-s3 (1.205.0)
105+
aws-sdk-s3 (1.206.0)
106106
aws-sdk-core (~> 3, >= 3.234.0)
107107
aws-sdk-kms (~> 1)
108108
aws-sigv4 (~> 1.5)
@@ -177,7 +177,7 @@ GEM
177177
rails-i18n
178178
digest-crc (0.7.0)
179179
rake (>= 12.0.0, < 14.0.0)
180-
dotenv (3.1.8)
180+
dotenv (3.2.0)
181181
drb (2.2.3)
182182
ed25519 (1.4.0)
183183
erb (6.0.0)
@@ -302,7 +302,7 @@ GEM
302302
multi_json (~> 1.11)
303303
os (>= 0.9, < 2.0)
304304
signet (>= 0.16, < 2.a)
305-
high_voltage (4.0.0)
305+
high_voltage (5.0.0)
306306
highline (3.1.2)
307307
reline
308308
httpclient (2.9.0)
@@ -339,7 +339,7 @@ GEM
339339
jmespath (1.6.2)
340340
jsbundling-rails (1.3.1)
341341
railties (>= 6.0.0)
342-
json (2.16.0)
342+
json (2.17.0)
343343
jwt (3.1.2)
344344
base64
345345
kamal (2.9.0)
@@ -426,7 +426,7 @@ GEM
426426
stimulus-rails
427427
turbo-rails
428428
msgpack (1.8.0)
429-
multi_json (1.17.0)
429+
multi_json (1.18.0)
430430
multipart-post (2.4.1)
431431
mutex_m (0.3.0)
432432
mysql2 (0.5.7)
@@ -484,7 +484,7 @@ GEM
484484
overmind (2.5.1-x86-freebsd)
485485
overmind (2.5.1-x86-linux)
486486
overmind (2.5.1-x86_64-freebsd)
487-
pagy (43.1.6)
487+
pagy (43.1.8)
488488
json
489489
yaml
490490
parallel (1.27.0)
@@ -575,7 +575,7 @@ GEM
575575
rb-fsevent (0.11.2)
576576
rb-inotify (0.11.1)
577577
ffi (~> 1.0)
578-
rdoc (6.16.0)
578+
rdoc (6.16.1)
579579
erb
580580
psych (>= 4.0.0)
581581
tsort
@@ -616,7 +616,7 @@ GEM
616616
lint_roller (~> 1.1)
617617
rubocop (>= 1.75.0, < 2.0)
618618
rubocop-ast (>= 1.38.0, < 2.0)
619-
rubocop-rails (2.34.1)
619+
rubocop-rails (2.34.2)
620620
activesupport (>= 4.2.0)
621621
lint_roller (~> 1.1)
622622
rack (>= 1.1)
@@ -690,7 +690,7 @@ GEM
690690
fugit (~> 1.11)
691691
railties (>= 7.1)
692692
thor (>= 1.3.1)
693-
sqlite3 (2.8.0)
693+
sqlite3 (2.8.1)
694694
mini_portile2 (~> 2.8.0)
695695
sshkit (1.24.0)
696696
base64
@@ -713,7 +713,7 @@ GEM
713713
rubocop-performance (~> 1.25.0)
714714
stimulus-rails (1.3.4)
715715
railties (>= 6.0.0)
716-
stringio (3.1.8)
716+
stringio (3.1.9)
717717
terminal-table (4.0.0)
718718
unicode-display_width (>= 1.1.1, < 4)
719719
terser (1.2.6)
@@ -805,7 +805,7 @@ DEPENDENCIES
805805
debug
806806
devise (>= 4.9.0)
807807
devise-i18n
808-
dotenv (~> 3.1)
808+
dotenv (~> 3.2)
809809
erb_lint (~> 0.9.0)
810810
foreman
811811
google-cloud-storage (~> 1.57)
@@ -815,7 +815,7 @@ DEPENDENCIES
815815
invisible_captcha (~> 2.3)
816816
jbuilder
817817
jsbundling-rails
818-
json (~> 2.16)
818+
json (~> 2.17)
819819
kamal
820820
kaminari (~> 1.2)
821821
kramdown

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.63.6
1+
1.64.1

app/controllers/users/registrations_controller.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
3030
# end
3131

3232
# DELETE /resource
33-
# def destroy
34-
# super
35-
# end
33+
def destroy
34+
# Call Devise's default destroy behavior
35+
super
36+
end
3637

3738
# GET /resource/cancel
3839
# Forces the session data which is usually expired after sign

0 commit comments

Comments
 (0)