Skip to content

Commit f7d1ee5

Browse files
authored
Merge branch 'main' into provider-specific-csv-files-420-reopened
2 parents 4f4701a + c50dae2 commit f7d1ee5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+286
-492
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Set up Ruby
2020
uses: ruby/setup-ruby@v1
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Set up Ruby
3636
uses: ruby/setup-ruby@v1
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- name: Checkout code
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949

5050
- name: Set up Ruby
5151
uses: ruby/setup-ruby@v1
@@ -74,7 +74,7 @@ jobs:
7474
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y build-essential git libpq-dev pkg-config google-chrome-stable
7575

7676
- name: Checkout code
77-
uses: actions/checkout@v5
77+
uses: actions/checkout@v6
7878

7979
- name: Set up Ruby
8080
uses: ruby/setup-ruby@v1
@@ -86,7 +86,7 @@ jobs:
8686
run: bin/rails db:test:prepare && bin/rspec
8787

8888
- name: Keep screenshots from failed system tests
89-
uses: actions/upload-artifact@v4
89+
uses: actions/upload-artifact@v5
9090
if: failure()
9191
with:
9292
name: screenshots

.github/workflows/deploy-production.yml

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

1010
steps:
1111
- name: Checkout code
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313

1414
- name: Set up Ruby
1515
uses: ruby/setup-ruby@v1

.github/workflows/deploy-staging.yml

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

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Set up Ruby
2121
uses: ruby/setup-ruby@v1

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ruby 3.4.6
2+
nodejs 24.9.0

Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ source "https://rubygems.org"
33
ruby "3.4.6"
44

55
gem "active_storage_validations"
6-
gem "acts-as-taggable-on"
6+
gem "acts-as-taggable-on", "~> 13.0"
77
gem "aws-sdk-s3", require: false
88
gem "azure_file_shares"
99
gem "bcrypt", "~> 3.1.7"
1010
gem "bootsnap", require: false
1111
gem "csv"
12+
gem "herb", "~> 0.8.4"
1213
gem "image_processing", "~> 1.14"
1314
gem "importmap-rails"
1415
gem "jbuilder"
@@ -20,7 +21,8 @@ gem "pg", "~> 1.6"
2021
gem "propshaft"
2122
gem "puma", ">= 5.0"
2223
gem "rack-attack"
23-
gem "rails", "~> 8.0.2"
24+
gem "rails", "~> 8.1.1"
25+
gem "reactionview", "~> 0.2.0"
2426
gem "requestjs-rails"
2527
gem "scout_apm"
2628
gem "scout_apm_logging", "~> 2.1"

0 commit comments

Comments
 (0)