Skip to content

Commit 452bd49

Browse files
committed
Merge branch 'renovate/major-ruby-on-rails-packages' of https://github.com/csvalpha/amber-api into renovate/major-ruby-on-rails-packages
2 parents 1a4837b + 2aa52df commit 452bd49

26 files changed

+86
-86
lines changed

.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@fa247637f74d407f51d8423a5dc10abae1917873 # v3.1.0
173+
uses: getsentry/action-release@00ed2a6cc2171514e031a0f5b4b3cdc586dc171a # v3.1.1
174174
env:
175175
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
176176
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
CAMO_KEY: secret_camo_key
9797
services:
9898
camo:
99-
image: rx14/camo.cr:latest
99+
image: rx14/camo.cr:latest@sha256:5e55c311ea0ca56532aedfa71953bde9e7f4518f3381d413835c87c86a893ca8
100100
env:
101101
PORT: 9090
102102
db:
@@ -150,7 +150,7 @@ jobs:
150150

151151
- name: Upload coverage report artifact
152152
if: ${{ !cancelled() }}
153-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
153+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
154154
with:
155155
name: coverage
156156
path: coverage/

.github/workflows/publish-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@fa247637f74d407f51d8423a5dc10abae1917873 # v3.1.0
80+
uses: getsentry/action-release@00ed2a6cc2171514e031a0f5b4b3cdc586dc171a # v3.1.1
8181
env:
8282
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
8383
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

Gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ gem 'carrierwave', '~> 3.1', '>= 3.1.1'
77
gem 'carrierwave-base64', '~> 2.11'
88
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
99
gem 'case_transform', '~> 0.2'
10-
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
11-
gem 'csv', '~> 3.3', '>= 3.3.2'
10+
gem 'counter_culture', '~> 3.9'
11+
gem 'csv', '~> 3.3', '>= 3.3.3'
1212
gem 'doorkeeper', '~> 5.8', '>= 5.8.1'
1313
gem 'doorkeeper-i18n', '~> 5.2', '>= 5.2.7'
1414
gem 'exifr', '~> 1.4', '>= 1.4.1'
@@ -20,12 +20,12 @@ gem 'improvmx', '~> 0.2.1'
2020
gem 'isbn_validation', '~> 1.2', '>= 1.2.2'
2121
gem 'jsonapi-authorization', '~> 3.0', '>= 3.0.2'
2222
gem 'jsonapi-resources', '~> 0.9.1'
23-
gem 'message_bus', '~> 4.3', '>= 4.3.9'
23+
gem 'message_bus', '~> 4.4', '>= 4.4.1'
2424
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.5'
28+
gem 'phonelib', '~> 0.10', '>= 0.10.6'
2929
gem 'puma', '~> 6.6'
3030
gem 'pundit', '~> 2.5'
3131
gem 'rack-attack', '~> 6.7'
@@ -36,9 +36,9 @@ 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.22', '>= 5.22.4'
40-
gem 'sentry-ruby', '~> 5.22', '>= 5.22.4'
41-
gem 'sentry-sidekiq', '~> 5.22', '>= 5.22.4'
39+
gem 'sentry-rails', '~> 5.23'
40+
gem 'sentry-ruby', '~> 5.23'
41+
gem 'sentry-sidekiq', '~> 5.23'
4242
gem 'sepa_king', '~> 0.14'
4343
gem 'sidekiq', '~> 7.3', '>= 7.3.9'
4444
gem 'sidekiq-scheduler', '~> 5.0', '>= 5.0.6'
@@ -66,16 +66,16 @@ group :development do
6666
gem 'binding_of_caller', '~> 1.0', '>= 1.0.1'
6767
gem 'listen', '~> 3.9'
6868
gem 'mina', '~> 1.2', '>= 1.2.5'
69-
gem 'spring', '~> 4.2', '>= 4.2.1'
69+
gem 'spring', '~> 4.3'
7070
gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
7171
gem 'spring-watcher-listen', '~> 2.1'
7272
end
7373

7474
group :test do
7575
gem 'guard-rspec', '~> 4.7', '>= 4.7.3', require: false
76-
gem 'rspec-rails', '~> 6.1', '>= 6.1.5'
77-
gem 'rubocop', '~> 1.73', '>= 1.73.2', require: false
78-
gem 'rubocop-factory_bot', '~> 2.27', require: false
76+
gem 'rspec-rails', '~> 7.1', '>= 7.1.1'
77+
gem 'rubocop', '~> 1.74', require: false
78+
gem 'rubocop-factory_bot', '~> 2.27', '>= 2.27.1', require: false
7979
gem 'rubocop-performance', '~> 1.24', require: false
8080
gem 'rubocop-rails', '~> 2.30', '>= 2.30.3', require: false
8181
gem 'rubocop-rspec', '~> 3.5', require: false

Gemfile.lock

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ GEM
7777
uri (>= 0.13.1)
7878
addressable (2.8.7)
7979
public_suffix (>= 2.0.2, < 7.0)
80-
ast (2.4.2)
80+
ast (2.4.3)
8181
awesome_print (1.9.2)
8282
base64 (0.2.0)
8383
bcrypt (3.1.20)
@@ -88,6 +88,8 @@ GEM
8888
rack (>= 0.9.0)
8989
bigdecimal (3.1.9)
9090
bigdecimal (3.1.9-java)
91+
binding_of_caller (1.0.1)
92+
debug_inspector (>= 1.2.0)
9193
binding_of_caller (1.0.1)
9294
debug_inspector (>= 1.2.0)
9395
bootsnap (1.18.4)
@@ -121,14 +123,14 @@ GEM
121123
concurrent-ruby (1.3.5)
122124
connection_pool (2.5.0)
123125
consistency_fail (0.3.7)
124-
counter_culture (3.8.2)
126+
counter_culture (3.9.0)
125127
activerecord (>= 4.2)
126128
activesupport (>= 4.2)
127129
crack (1.0.0)
128130
bigdecimal
129131
rexml
130132
crass (1.0.6)
131-
csv (3.3.2)
133+
csv (3.3.3)
132134
date (3.4.1)
133135
date (3.4.1-java)
134136
debug_inspector (1.2.0)
@@ -219,8 +221,8 @@ GEM
219221
isbn_validation (1.2.2)
220222
activerecord (>= 3)
221223
jar-dependencies (0.5.5)
222-
json (2.10.1)
223-
json (2.10.1-java)
224+
json (2.10.2)
225+
json (2.10.2-java)
224226
jsonapi-authorization (3.0.2)
225227
jsonapi-resources (~> 0.9.0)
226228
pundit (>= 1.0.0, < 3.0.0)
@@ -233,7 +235,7 @@ GEM
233235
listen (3.9.0)
234236
rb-fsevent (~> 0.10, >= 0.10.3)
235237
rb-inotify (~> 0.9, >= 0.9.10)
236-
llhttp-ffi (0.5.0)
238+
llhttp-ffi (0.5.1)
237239
ffi-compiler (~> 1.0)
238240
rake (~> 13.0)
239241
logger (1.6.6)
@@ -247,13 +249,13 @@ GEM
247249
net-pop
248250
net-smtp
249251
marcel (1.0.4)
250-
message_bus (4.3.9)
252+
message_bus (4.4.1)
251253
rack (>= 1.1.3)
252254
method_source (1.1.0)
253255
mime-types (3.6.1)
254256
logger
255257
mime-types-data (~> 3.2015)
256-
mime-types-data (3.2025.0304)
258+
mime-types-data (3.2025.0318)
257259
mina (1.2.5)
258260
rake
259261
mini_magick (5.2.0)
@@ -277,12 +279,12 @@ GEM
277279
netrc (0.11.0)
278280
nio4r (2.7.4)
279281
nio4r (2.7.4-java)
280-
nokogiri (1.18.3)
282+
nokogiri (1.18.6)
281283
mini_portile2 (~> 2.8.2)
282284
racc (~> 1.4)
283-
nokogiri (1.18.3-java)
285+
nokogiri (1.18.6-java)
284286
racc (~> 1.4)
285-
nokogiri (1.18.3-x86_64-linux-gnu)
287+
nokogiri (1.18.6-x86_64-linux-gnu)
286288
racc (~> 1.4)
287289
notiffany (0.1.3)
288290
nenv (~> 0.1)
@@ -294,11 +296,11 @@ GEM
294296
parallel (1.26.3)
295297
paranoia (3.0.1)
296298
activerecord (>= 6, < 8.1)
297-
parser (3.3.7.1)
299+
parser (3.3.7.2)
298300
ast (~> 2.4.1)
299301
racc
300302
pg (1.5.9)
301-
phonelib (0.10.5)
303+
phonelib (0.10.6)
302304
pp (0.6.2)
303305
prettyprint
304306
prettyprint (0.2.0)
@@ -330,20 +332,20 @@ GEM
330332
raabro (1.4.0)
331333
racc (1.8.1)
332334
racc (1.8.1-java)
333-
rack (2.2.12)
335+
rack (3.0.14)
334336
rack-attack (6.7.0)
335337
rack (>= 1.0, < 4)
336338
rack-cors (2.0.2)
337339
rack (>= 2.0.0)
338340
rack-mini-profiler (3.3.1)
339341
rack (>= 1.2.0)
340-
rack-session (1.0.2)
341-
rack (< 3)
342+
rack-session (2.1.0)
343+
base64 (>= 0.1.0)
344+
rack (>= 3.0.0)
342345
rack-test (2.2.0)
343346
rack (>= 1.3)
344-
rackup (1.0.1)
345-
rack (< 3)
346-
webrick
347+
rackup (2.2.1)
348+
rack (>= 3)
347349
rails (8.0.1)
348350
actioncable (= 8.0.1)
349351
actionmailbox (= 8.0.1)
@@ -382,7 +384,7 @@ GEM
382384
rb-inotify (0.11.1)
383385
ffi (~> 1.0)
384386
rb-readline (0.5.5)
385-
rdoc (6.12.0)
387+
rdoc (6.13.0)
386388
psych (>= 4.0.0)
387389
redis (5.4.0)
388390
redis-client (>= 0.22.0)
@@ -433,16 +435,16 @@ GEM
433435
rspec-mocks (3.13.2)
434436
diff-lcs (>= 1.2.0, < 2.0)
435437
rspec-support (~> 3.13.0)
436-
rspec-rails (6.1.5)
437-
actionpack (>= 6.1)
438-
activesupport (>= 6.1)
439-
railties (>= 6.1)
438+
rspec-rails (7.1.1)
439+
actionpack (>= 7.0)
440+
activesupport (>= 7.0)
441+
railties (>= 7.0)
440442
rspec-core (~> 3.13)
441443
rspec-expectations (~> 3.13)
442444
rspec-mocks (~> 3.13)
443445
rspec-support (~> 3.13)
444446
rspec-support (3.13.2)
445-
rubocop (1.73.2)
447+
rubocop (1.74.0)
446448
json (~> 2.3)
447449
language_server-protocol (~> 3.17.0.2)
448450
lint_roller (~> 1.1.0)
@@ -453,9 +455,9 @@ GEM
453455
rubocop-ast (>= 1.38.0, < 2.0)
454456
ruby-progressbar (~> 1.7)
455457
unicode-display_width (>= 2.4.0, < 4.0)
456-
rubocop-ast (1.38.1)
457-
parser (>= 3.3.1.0)
458-
rubocop-factory_bot (2.27.0)
458+
rubocop-ast (1.41.0)
459+
parser (>= 3.3.7.2)
460+
rubocop-factory_bot (2.27.1)
459461
lint_roller (~> 1.1)
460462
rubocop (~> 1.72, >= 1.72.1)
461463
rubocop-performance (1.24.0)
@@ -484,14 +486,14 @@ GEM
484486
rufus-scheduler (3.9.2)
485487
fugit (~> 1.1, >= 1.11.1)
486488
securerandom (0.4.1)
487-
sentry-rails (5.22.4)
489+
sentry-rails (5.23.0)
488490
railties (>= 5.0)
489-
sentry-ruby (~> 5.22.4)
490-
sentry-ruby (5.22.4)
491+
sentry-ruby (~> 5.23.0)
492+
sentry-ruby (5.23.0)
491493
bigdecimal
492494
concurrent-ruby (~> 1.0, >= 1.0.2)
493-
sentry-sidekiq (5.22.4)
494-
sentry-ruby (~> 5.22.4)
495+
sentry-sidekiq (5.23.0)
496+
sentry-ruby (~> 5.23.0)
495497
sidekiq (>= 3.0)
496498
sepa_king (0.14.0)
497499
activemodel (>= 4.2)
@@ -517,7 +519,7 @@ GEM
517519
simplecov_json_formatter (0.1.4)
518520
spoon (0.0.6)
519521
ffi
520-
spring (4.2.1)
522+
spring (4.3.0)
521523
spring-commands-rspec (1.0.4)
522524
spring (>= 0.9.1)
523525
spring-watcher-listen (2.1.0)
@@ -533,7 +535,7 @@ GEM
533535
timeout (0.4.3)
534536
tzinfo (2.0.6)
535537
concurrent-ruby (~> 1.0)
536-
tzinfo-data (1.2025.1)
538+
tzinfo-data (1.2025.2)
537539
tzinfo (>= 1.0.0)
538540
unicode-display_width (3.1.4)
539541
unicode-emoji (~> 4.0, >= 4.0.4)
@@ -551,7 +553,6 @@ GEM
551553
addressable (>= 2.8.0)
552554
crack (>= 0.3.2)
553555
hashdiff (>= 0.4.0, < 2.0.0)
554-
webrick (1.9.1)
555556
websocket-driver (0.7.7)
556557
base64
557558
websocket-extensions (>= 0.1.0)
@@ -583,8 +584,8 @@ DEPENDENCIES
583584
case_transform (~> 0.2)
584585
colorize (~> 1.1)
585586
consistency_fail
586-
counter_culture (~> 3.8, >= 3.8.2)
587-
csv (~> 3.3, >= 3.3.2)
587+
counter_culture (~> 3.9)
588+
csv (~> 3.3, >= 3.3.3)
588589
doorkeeper (~> 5.8, >= 5.8.1)
589590
doorkeeper-i18n (~> 5.2, >= 5.2.7)
590591
dotenv-rails (~> 3.1, >= 3.1.7)
@@ -602,13 +603,13 @@ DEPENDENCIES
602603
jsonapi-authorization (~> 3.0, >= 3.0.2)
603604
jsonapi-resources (~> 0.9.1)
604605
listen (~> 3.9)
605-
message_bus (~> 4.3, >= 4.3.9)
606+
message_bus (~> 4.4, >= 4.4.1)
606607
mina (~> 1.2, >= 1.2.5)
607608
mini_magick (~> 5.2)
608609
paper_trail (~> 16.0)
609610
paranoia (~> 3.0, >= 3.0.1)
610611
pg (~> 1.5, >= 1.5.9)
611-
phonelib (~> 0.10, >= 0.10.5)
612+
phonelib (~> 0.10, >= 0.10.6)
612613
pry-byebug (~> 3.10, >= 3.10.1)
613614
pry-rails (~> 0.3, >= 0.3.11)
614615
puma (~> 6.6)
@@ -621,24 +622,24 @@ DEPENDENCIES
621622
rb-readline (~> 0.5, >= 0.5.5)
622623
redis (~> 5.4)
623624
roo (~> 2.10, >= 2.10.1)
624-
rspec-rails (~> 6.1, >= 6.1.5)
625-
rubocop (~> 1.73, >= 1.73.2)
626-
rubocop-factory_bot (~> 2.27)
625+
rspec-rails (~> 7.1, >= 7.1.1)
626+
rubocop (~> 1.74)
627+
rubocop-factory_bot (~> 2.27, >= 2.27.1)
627628
rubocop-performance (~> 1.24)
628629
rubocop-rails (~> 2.30, >= 2.30.3)
629630
rubocop-rspec (~> 3.5)
630631
rubocop-rspec_rails (~> 2.31)
631632
ruby-filemagic (~> 0.7, >= 0.7.3)
632633
rubyzip (~> 2.4, >= 2.4.1)
633-
sentry-rails (~> 5.22, >= 5.22.4)
634-
sentry-ruby (~> 5.22, >= 5.22.4)
635-
sentry-sidekiq (~> 5.22, >= 5.22.4)
634+
sentry-rails (~> 5.23)
635+
sentry-ruby (~> 5.23)
636+
sentry-sidekiq (~> 5.23)
636637
sepa_king (~> 0.14)
637638
sidekiq (~> 7.3, >= 7.3.9)
638639
sidekiq-scheduler (~> 5.0, >= 5.0.6)
639640
simplecov (~> 0.22)
640641
simplecov-lcov (~> 0.8)
641-
spring (~> 4.2, >= 4.2.1)
642+
spring (~> 4.3)
642643
spring-commands-rspec (~> 1.0, >= 1.0.4)
643644
spring-watcher-listen (~> 2.1)
644645
terminal-notifier-guard (~> 1.7)

app/controllers/v1/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def user_is_not_member_of_group_error # rubocop:disable Metrics/MethodLength
4343
source: {
4444
pointer: '/data/relationships/group'
4545
},
46-
status: '422'
46+
status: 422
4747
}]
4848
}, status: :unprocessable_entity
4949
end

app/controllers/v1/stored_mails_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def limit_error
3333
title: 'Already sent a moderated email today',
3434
detail: 'Already sent a moderated email today, try again tomorrow',
3535
code: '100',
36-
status: '422'
36+
status: 422
3737
}]
3838
}, status: :unprocessable_entity
3939
end

config/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class Application < Rails::Application
6363
config.action_mailbox.ingress = :improvmx
6464
config.action_mailbox.incinerate_after = 7.days
6565

66-
config.active_job.queue_adapter = :sidekiq
6766
config.time_zone = 'Europe/Amsterdam'
6867

6968
config.x.mail_domains = %w[csvalpha.nl societeitflux.nl]

0 commit comments

Comments
 (0)