Skip to content

Commit cae374e

Browse files
committed
Merge branch 'staging' into feature/improveSOGsuggestions
2 parents ef9171a + 8627531 commit cae374e

25 files changed

Lines changed: 318 additions & 207 deletions

.github/workflows/continuous-delivery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
docker-compose up -d
171171
172172
- name: Finalize Sentry release
173-
uses: getsentry/action-release@00ed2a6cc2171514e031a0f5b4b3cdc586dc171a # v3.1.1
173+
uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c # v3.2.0
174174
env:
175175
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
176176
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
ref: ${{ inputs.sha }}
2828

2929
- name: Build test image
30-
uses: guidojw/actions/build-docker-image@fa7c189ff9d3c00fb9c69b98ff701cd772783dbd # v1.4.8
30+
uses: guidojw/actions/build-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
3131
with:
3232
file: Dockerfile
3333
build-args: |
@@ -67,7 +67,7 @@ jobs:
6767
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.7
6868
6969
- name: Load test image
70-
uses: guidojw/actions/load-docker-image@fa7c189ff9d3c00fb9c69b98ff701cd772783dbd # v1.4.8
70+
uses: guidojw/actions/load-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
7171
with:
7272
name: app
7373

@@ -122,7 +122,7 @@ jobs:
122122
echo '::add-matcher::.github/problem-matchers/rspec.json'
123123
124124
- name: Load test image
125-
uses: guidojw/actions/load-docker-image@fa7c189ff9d3c00fb9c69b98ff701cd772783dbd # v1.4.8
125+
uses: guidojw/actions/load-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
126126
with:
127127
name: app
128128

.github/workflows/publish-image.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ jobs:
5454
fetch-depth: 0
5555

5656
- name: Set up Docker Buildx
57-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
57+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5858

5959
- name: Login to GitHub Container Registry
60-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
60+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
6161
with:
6262
registry: ${{ vars.DOCKER_REGISTRY_URL }}
6363
username: ${{ github.repository_owner }}
6464
password: ${{ secrets.GITHUB_TOKEN }}
6565

6666
- name: Build and push image
67-
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
67+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6868
with:
6969
push: true
7070
context: .
@@ -77,7 +77,7 @@ jobs:
7777
7878
- name: Create Sentry release
7979
if: ${{ !(github.event_name == 'workflow_dispatch' && github.workflow == 'Publish Image') }}
80-
uses: getsentry/action-release@00ed2a6cc2171514e031a0f5b4b3cdc586dc171a # v3.1.1
80+
uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c # v3.2.0
8181
env:
8282
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
8383
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins:
66
- rubocop-rspec_rails
77

88
AllCops:
9-
TargetRailsVersion: 7.1
9+
TargetRailsVersion: 7.2
1010
TargetRubyVersion: 3.3
1111
Exclude:
1212
- 'db/schema.rb'

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.4
1+
3.4.5

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM ruby:3.4.4-alpine@sha256:5bdfa2312f3f0bc9bd077e954c943652155a093db228af978873ff92389300d3
2+
FROM ruby:3.4.5-alpine@sha256:e284f39a2103a564dca9771a81bfecb455b04cd3be4149b133ed7e508ef1b65f
33

44
ARG BUILD_HASH='unknown'
55
ENV BUILD_HASH=$BUILD_HASH

Gemfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ source 'https://rubygems.org'
22

33
gem 'active_model_otp', '~> 2.3', '>= 2.3.4'
44
gem 'bcrypt', '~> 3.1', '>= 3.1.20'
5-
gem 'bootsnap', '~> 1.18', '>= 1.18.4'
5+
gem 'bootsnap', '~> 1.18', '>= 1.18.6'
66
gem 'carrierwave', '~> 3.1', '>= 3.1.2'
77
gem 'carrierwave-base64', '~> 2.11'
88
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
99
gem 'case_transform', '~> 0.2'
1010
gem 'counter_culture', '~> 3.10', '>= 3.10.1'
11-
gem 'csv', '~> 3.3', '>= 3.3.4'
11+
gem 'csv', '~> 3.3', '>= 3.3.5'
1212
gem 'doorkeeper', '~> 5.8', '>= 5.8.2'
1313
gem 'doorkeeper-i18n', '~> 5.2', '>= 5.2.7'
1414
gem 'exifr', '~> 1.4', '>= 1.4.1'
@@ -25,30 +25,30 @@ gem 'mini_magick', '~> 5.2'
2525
gem 'paper_trail', '~> 16.0'
2626
gem 'paranoia', '~> 3.0', '>= 3.0.1'
2727
gem 'pg', '~> 1.5', '>= 1.5.9'
28-
gem 'phonelib', '~> 0.10', '>= 0.10.8'
28+
gem 'phonelib', '~> 0.10', '>= 0.10.9'
2929
gem 'puma', '~> 6.6'
3030
gem 'pundit', '~> 2.5'
3131
gem 'rack-attack', '~> 6.7'
3232
gem 'rack-cors', '~> 3.0', require: 'rack/cors'
33-
gem 'rails', '~> 7.1.5', '>= 7.1.5.1'
33+
gem 'rails', '~> 7.2.2', '>= 7.2.2.1'
3434
gem 'rails-i18n', '~> 7.0', '>= 7.0.10'
3535
gem 'redis', '~> 5.4'
3636
gem 'roo', '~> 2.10', '>= 2.10.1'
3737
gem 'ruby-filemagic', '~> 0.7', '>= 0.7.3'
3838
gem 'rubyzip', '~> 2.4', '>= 2.4.1'
39-
gem 'sentry-rails', '~> 5.23'
40-
gem 'sentry-ruby', '~> 5.23'
41-
gem 'sentry-sidekiq', '~> 5.23'
39+
gem 'sentry-rails', '~> 5.24'
40+
gem 'sentry-ruby', '~> 5.24'
41+
gem 'sentry-sidekiq', '~> 5.24'
4242
gem 'sepa_king', '~> 0.14'
4343
gem 'sidekiq', '~> 7.3', '>= 7.3.9'
44-
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.6'
44+
gem 'sidekiq-scheduler', '~> 6.0', '>= 6.0.1'
4545
gem 'validates_timeliness', '~> 7.1.0'
4646
gem 'vpim', '~> 24.2', '>= 24.2.20'
4747

4848
group :development, :test do
4949
gem 'awesome_print', '~> 1.9', '>= 1.9.2'
5050
gem 'brakeman', '~> 7.0', '>= 7.0.2', require: false
51-
gem 'bullet', '~> 8.0', '>= 8.0.6'
51+
gem 'bullet', '~> 8.0', '>= 8.0.8'
5252
gem 'colorize', '~> 1.1'
5353
gem 'consistency_fail'
5454
gem 'dotenv-rails', '~> 3.1', '>= 3.1.8'
@@ -73,11 +73,11 @@ end
7373

7474
group :test do
7575
gem 'guard-rspec', '~> 4.7', '>= 4.7.3', require: false
76-
gem 'rspec-rails', '~> 7.1', '>= 7.1.1'
77-
gem 'rubocop', '~> 1.75', '>= 1.75.5', require: false
76+
gem 'rspec-rails', '~> 8.0'
77+
gem 'rubocop', '~> 1.75', '>= 1.75.8', require: false
7878
gem 'rubocop-factory_bot', '~> 2.27', '>= 2.27.1', require: false
7979
gem 'rubocop-performance', '~> 1.25', require: false
80-
gem 'rubocop-rails', '~> 2.31', require: false
80+
gem 'rubocop-rails', '~> 2.32', require: false
8181
gem 'rubocop-rspec', '~> 3.6', require: false
8282
gem 'rubocop-rspec_rails', '~> 2.31', require: false
8383
gem 'simplecov', '~> 0.22', require: false

0 commit comments

Comments
 (0)