Skip to content

Commit 8743725

Browse files
chore(deps): update all non-major bundler dependencies (#573)
* chore(deps): update all non-major bundler dependencies * Update Gemfile * Update Gemfile * generate gemfile.lock * fix first part of lint * fix lint * fix lint v2 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: lodewiges <[email protected]> Co-authored-by: Lodewiges <[email protected]>
1 parent 8db72c2 commit 8743725

File tree

10 files changed

+76
-67
lines changed

10 files changed

+76
-67
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,6 @@ Lint/StructNewOverride:
137137

138138
Naming/InclusiveLanguage:
139139
Enabled: false
140+
141+
Naming/PredicateMethod:
142+
Enabled: false

Gemfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ 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'
10-
gem 'counter_culture', '~> 3.10', '>= 3.10.1'
10+
gem 'counter_culture', '~> 3.11', '>= 3.11.2'
1111
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'
1515
gem 'friendly_id', '~> 5.5', '>= 5.5.1'
16-
gem 'http', '~> 5.2'
16+
gem 'http', '~> 5.3', '>= 5.3.1'
1717
gem 'iban-tools', '~> 1.2.1'
18-
gem 'icalendar', '~> 2.11'
18+
gem 'icalendar', '~> 2.11', '>= 2.11.2'
1919
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'
2323
gem 'message_bus', '~> 4.4', '>= 4.4.1'
24-
gem 'mini_magick', '~> 5.2'
24+
gem 'mini_magick', '~> 5.3'
2525
gem 'paper_trail', '~> 16.0'
2626
gem 'paranoia', '~> 3.0', '>= 3.0.1'
27-
gem 'pg', '~> 1.5', '>= 1.5.9'
28-
gem 'phonelib', '~> 0.10', '>= 0.10.9'
29-
gem 'puma', '~> 6.6'
27+
gem 'pg', '~> 1.6', '>= 1.6.1'
28+
gem 'phonelib', '~> 0.10', '>= 0.10.11'
29+
gem 'puma', '~> 6.6', '>= 6.6.1'
3030
gem 'pundit', '~> 2.5'
3131
gem 'rack-attack', '~> 6.7'
3232
gem 'rack-cors', '~> 3.0', require: 'rack/cors'
3333
gem 'rails', '~> 7.2.2', '>= 7.2.2.1'
3434
gem 'rails-i18n', '~> 7.0', '>= 7.0.10'
35-
gem 'redis', '~> 5.4'
35+
gem 'redis', '~> 5.4', '>= 5.4.1'
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.24'
40-
gem 'sentry-ruby', '~> 5.24'
41-
gem 'sentry-sidekiq', '~> 5.24'
39+
gem 'sentry-rails', '~> 5.26'
40+
gem 'sentry-ruby', '~> 5.26'
41+
gem 'sentry-sidekiq', '~> 5.26'
4242
gem 'sepa_king', '~> 0.14'
4343
gem 'sidekiq', '~> 7.3', '>= 7.3.9'
4444
gem 'sidekiq-scheduler', '~> 6.0', '>= 6.0.1'
@@ -47,13 +47,13 @@ gem 'vpim', '~> 24.2', '>= 24.2.20'
4747

4848
group :development, :test do
4949
gem 'awesome_print', '~> 1.9', '>= 1.9.2'
50-
gem 'brakeman', '~> 7.0', '>= 7.0.2', require: false
50+
gem 'brakeman', '~> 7.1', require: false
5151
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'
55-
gem 'factory_bot_rails', '~> 6.4', '>= 6.4.4'
56-
gem 'faker', '~> 3.5', '>= 3.5.1'
55+
gem 'factory_bot_rails', '~> 6.5'
56+
gem 'faker', '~> 3.5', '>= 3.5.2'
5757
gem 'fuubar', '~> 2.5', '>= 2.5.1'
5858
gem 'pry-byebug', '~> 3.11', require: false
5959
gem 'pry-rails', '~> 0.3', '>= 0.3.11'
@@ -66,18 +66,18 @@ 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.3'
69+
gem 'spring', '~> 4.4'
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', '~> 8.0'
77-
gem 'rubocop', '~> 1.75', '>= 1.75.8', require: false
76+
gem 'rspec-rails', '~> 8.0', '>= 8.0.2'
77+
gem 'rubocop', '~> 1.79', '>= 1.79.2', 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.32', require: false
80+
gem 'rubocop-rails', '~> 2.33', '>= 2.33.3', 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

Gemfile.lock

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ GEM
9393
debug_inspector (>= 1.2.0)
9494
bootsnap (1.18.6)
9595
msgpack (~> 1.2)
96-
brakeman (7.0.2)
96+
brakeman (7.1.1)
9797
racc
9898
builder (3.3.0)
9999
bullet (8.0.8)
@@ -122,14 +122,14 @@ GEM
122122
concurrent-ruby (1.3.5)
123123
connection_pool (2.5.3)
124124
consistency_fail (0.3.7)
125-
counter_culture (3.10.1)
125+
counter_culture (3.11.3)
126126
activerecord (>= 4.2)
127127
activesupport (>= 4.2)
128128
crack (1.0.0)
129129
bigdecimal
130130
rexml
131131
crass (1.0.6)
132-
csv (3.3.4)
132+
csv (3.3.5)
133133
date (3.4.1)
134134
date (3.4.1-java)
135135
debug_inspector (1.2.0)
@@ -151,10 +151,10 @@ GEM
151151
exifr (1.4.1)
152152
factory_bot (6.5.1)
153153
activesupport (>= 6.1.0)
154-
factory_bot_rails (6.4.4)
154+
factory_bot_rails (6.5.1)
155155
factory_bot (~> 6.5)
156-
railties (>= 5.0.0)
157-
faker (3.5.1)
156+
railties (>= 6.1.0)
157+
faker (3.5.2)
158158
i18n (>= 1.8.11, < 2)
159159
fastimage (2.4.0)
160160
ffi (1.17.1)
@@ -189,9 +189,8 @@ GEM
189189
guard-compat (~> 1.1)
190190
rspec (>= 2.99.0, < 4.0)
191191
hashdiff (1.1.2)
192-
http (5.2.0)
192+
http (5.3.1)
193193
addressable (~> 2.8)
194-
base64 (~> 0.1)
195194
http-cookie (~> 1.0)
196195
http-form_data (~> 2.2)
197196
llhttp-ffi (~> 0.5.0)
@@ -202,7 +201,7 @@ GEM
202201
i18n (1.14.7)
203202
concurrent-ruby (~> 1.0)
204203
iban-tools (1.2.1)
205-
icalendar (2.11.0)
204+
icalendar (2.12.1)
206205
base64
207206
ice_cube (~> 0.16)
208207
logger
@@ -259,8 +258,7 @@ GEM
259258
mime-types-data (3.2025.0408)
260259
mina (1.2.5)
261260
rake
262-
mini_magick (5.2.0)
263-
benchmark
261+
mini_magick (5.3.1)
264262
logger
265263
mini_mime (1.1.5)
266264
mini_portile2 (2.8.8)
@@ -300,8 +298,8 @@ GEM
300298
parser (3.3.7.4)
301299
ast (~> 2.4.1)
302300
racc
303-
pg (1.5.9)
304-
phonelib (0.10.9)
301+
pg (1.6.2)
302+
phonelib (0.10.13)
305303
pp (0.6.2)
306304
prettyprint
307305
prettyprint (0.2.0)
@@ -325,9 +323,9 @@ GEM
325323
date
326324
jar-dependencies (>= 0.1.7)
327325
public_suffix (6.0.1)
328-
puma (6.6.0)
326+
puma (6.6.1)
329327
nio4r (~> 2.0)
330-
puma (6.6.0-java)
328+
puma (6.6.1-java)
331329
nio4r (~> 2.0)
332330
pundit (2.5.0)
333331
activesupport (>= 3.0.0)
@@ -389,7 +387,7 @@ GEM
389387
rb-readline (0.5.5)
390388
rdoc (6.13.1)
391389
psych (>= 4.0.0)
392-
redis (5.4.0)
390+
redis (5.4.1)
393391
redis-client (>= 0.22.0)
394392
redis-client (0.24.0)
395393
connection_pool
@@ -439,7 +437,7 @@ GEM
439437
rspec-mocks (3.13.2)
440438
diff-lcs (>= 1.2.0, < 2.0)
441439
rspec-support (~> 3.13.0)
442-
rspec-rails (8.0.0)
440+
rspec-rails (8.0.2)
443441
actionpack (>= 7.2)
444442
activesupport (>= 7.2)
445443
railties (>= 7.2)
@@ -448,18 +446,18 @@ GEM
448446
rspec-mocks (~> 3.13)
449447
rspec-support (~> 3.13)
450448
rspec-support (3.13.2)
451-
rubocop (1.75.8)
449+
rubocop (1.81.7)
452450
json (~> 2.3)
453451
language_server-protocol (~> 3.17.0.2)
454452
lint_roller (~> 1.1.0)
455453
parallel (~> 1.10)
456454
parser (>= 3.3.0.2)
457455
rainbow (>= 2.2.2, < 4.0)
458456
regexp_parser (>= 2.9.3, < 3.0)
459-
rubocop-ast (>= 1.44.0, < 2.0)
457+
rubocop-ast (>= 1.47.1, < 2.0)
460458
ruby-progressbar (~> 1.7)
461459
unicode-display_width (>= 2.4.0, < 4.0)
462-
rubocop-ast (1.44.1)
460+
rubocop-ast (1.47.1)
463461
parser (>= 3.3.7.2)
464462
prism (~> 1.4)
465463
rubocop-factory_bot (2.27.1)
@@ -469,7 +467,7 @@ GEM
469467
lint_roller (~> 1.1)
470468
rubocop (>= 1.75.0, < 2.0)
471469
rubocop-ast (>= 1.38.0, < 2.0)
472-
rubocop-rails (2.32.0)
470+
rubocop-rails (2.33.4)
473471
activesupport (>= 4.2.0)
474472
lint_roller (~> 1.1)
475473
rack (>= 1.1)
@@ -491,14 +489,14 @@ GEM
491489
rufus-scheduler (3.9.2)
492490
fugit (~> 1.1, >= 1.11.1)
493491
securerandom (0.4.1)
494-
sentry-rails (5.24.0)
492+
sentry-rails (5.28.1)
495493
railties (>= 5.0)
496-
sentry-ruby (~> 5.24.0)
497-
sentry-ruby (5.24.0)
494+
sentry-ruby (~> 5.28.1)
495+
sentry-ruby (5.28.1)
498496
bigdecimal
499497
concurrent-ruby (~> 1.0, >= 1.0.2)
500-
sentry-sidekiq (5.24.0)
501-
sentry-ruby (~> 5.24.0)
498+
sentry-sidekiq (5.28.1)
499+
sentry-ruby (~> 5.28.1)
502500
sidekiq (>= 3.0)
503501
sepa_king (0.14.0)
504502
activemodel (>= 4.2)
@@ -511,7 +509,7 @@ GEM
511509
logger
512510
rack (>= 2.2.4)
513511
redis-client (>= 0.22.2)
514-
sidekiq-scheduler (6.0.0)
512+
sidekiq-scheduler (6.0.1)
515513
rufus-scheduler (~> 3.2)
516514
sidekiq (>= 7.3, < 9)
517515
simplecov (0.22.0)
@@ -523,7 +521,7 @@ GEM
523521
simplecov_json_formatter (0.1.4)
524522
spoon (0.0.6)
525523
ffi
526-
spring (4.3.0)
524+
spring (4.4.0)
527525
spring-commands-rspec (1.0.4)
528526
spring (>= 0.9.1)
529527
spring-watcher-listen (2.1.0)
@@ -578,70 +576,70 @@ DEPENDENCIES
578576
better_errors (~> 2.10, >= 2.10.1)
579577
binding_of_caller (~> 1.0, >= 1.0.1)
580578
bootsnap (~> 1.18, >= 1.18.6)
581-
brakeman (~> 7.0, >= 7.0.2)
582-
bullet (~> 8.0, >= 8.0.7)
579+
brakeman (~> 7.1)
580+
bullet (~> 8.0, >= 8.0.8)
583581
carrierwave (~> 3.1, >= 3.1.2)
584582
carrierwave-base64 (~> 2.11)
585583
carrierwave-bombshelter (~> 0.2, >= 0.2.2)
586584
case_transform (~> 0.2)
587585
colorize (~> 1.1)
588586
consistency_fail
589-
counter_culture (~> 3.10, >= 3.10.1)
590-
csv (~> 3.3, >= 3.3.4)
587+
counter_culture (~> 3.11, >= 3.11.2)
588+
csv (~> 3.3, >= 3.3.5)
591589
doorkeeper (~> 5.8, >= 5.8.2)
592590
doorkeeper-i18n (~> 5.2, >= 5.2.7)
593591
dotenv-rails (~> 3.1, >= 3.1.8)
594592
exifr (~> 1.4, >= 1.4.1)
595-
factory_bot_rails (~> 6.4, >= 6.4.4)
596-
faker (~> 3.5, >= 3.5.1)
593+
factory_bot_rails (~> 6.5)
594+
faker (~> 3.5, >= 3.5.2)
597595
friendly_id (~> 5.5, >= 5.5.1)
598596
fuubar (~> 2.5, >= 2.5.1)
599597
guard-rspec (~> 4.7, >= 4.7.3)
600-
http (~> 5.2)
598+
http (~> 5.3, >= 5.3.1)
601599
iban-tools (~> 1.2.1)
602-
icalendar (~> 2.11)
600+
icalendar (~> 2.11, >= 2.11.2)
603601
improvmx (~> 0.2.1)
604602
isbn_validation (~> 1.2, >= 1.2.2)
605603
jsonapi-authorization (~> 3.0, >= 3.0.2)
606604
jsonapi-resources (~> 0.9.1)
607605
listen (~> 3.9)
608606
message_bus (~> 4.4, >= 4.4.1)
609607
mina (~> 1.2, >= 1.2.5)
610-
mini_magick (~> 5.2)
608+
mini_magick (~> 5.3)
611609
paper_trail (~> 16.0)
612610
paranoia (~> 3.0, >= 3.0.1)
613-
pg (~> 1.5, >= 1.5.9)
614-
phonelib (~> 0.10, >= 0.10.9)
611+
pg (~> 1.6, >= 1.6.1)
612+
phonelib (~> 0.10, >= 0.10.11)
615613
pry-byebug (~> 3.11)
616614
pry-rails (~> 0.3, >= 0.3.11)
617-
puma (~> 6.6)
615+
puma (~> 6.6, >= 6.6.1)
618616
pundit (~> 2.5)
619617
rack-attack (~> 6.7)
620618
rack-cors (~> 3.0)
621619
rack-mini-profiler (~> 3.3, >= 3.3.1)
622620
rails (~> 7.2.2, >= 7.2.2.1)
623621
rails-i18n (~> 7.0, >= 7.0.10)
624622
rb-readline (~> 0.5, >= 0.5.5)
625-
redis (~> 5.4)
623+
redis (~> 5.4, >= 5.4.1)
626624
roo (~> 2.10, >= 2.10.1)
627-
rspec-rails (~> 8.0)
628-
rubocop (~> 1.75, >= 1.75.6)
625+
rspec-rails (~> 8.0, >= 8.0.2)
626+
rubocop (~> 1.79, >= 1.79.2)
629627
rubocop-factory_bot (~> 2.27, >= 2.27.1)
630628
rubocop-performance (~> 1.25)
631-
rubocop-rails (~> 2.32)
629+
rubocop-rails (~> 2.33, >= 2.33.3)
632630
rubocop-rspec (~> 3.6)
633631
rubocop-rspec_rails (~> 2.31)
634632
ruby-filemagic (~> 0.7, >= 0.7.3)
635633
rubyzip (~> 2.4, >= 2.4.1)
636-
sentry-rails (~> 5.24)
637-
sentry-ruby (~> 5.24)
638-
sentry-sidekiq (~> 5.24)
634+
sentry-rails (~> 5.26)
635+
sentry-ruby (~> 5.26)
636+
sentry-sidekiq (~> 5.26)
639637
sepa_king (~> 0.14)
640638
sidekiq (~> 7.3, >= 7.3.9)
641-
sidekiq-scheduler (~> 6.0)
639+
sidekiq-scheduler (~> 6.0, >= 6.0.1)
642640
simplecov (~> 0.22)
643641
simplecov-lcov (~> 0.8)
644-
spring (~> 4.3)
642+
spring (~> 4.4)
645643
spring-commands-rspec (~> 1.0, >= 1.0.4)
646644
spring-watcher-listen (~> 2.1)
647645
terminal-notifier-guard (~> 1.7)

app/controllers/application_controller.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ def pundit_user
1717
current_user || current_application
1818
end
1919

20+
# rubocop:disable Rails/FindByOrAssignmentMemoization
2021
def current_user
2122
@current_user ||= User.find_by(id: doorkeeper_token&.resource_owner_id)
2223
end
24+
# rubocop:enable Rails/FindByOrAssignmentMemoization
2325

2426
def current_application
2527
doorkeeper_token&.application

app/controllers/v1/users_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
class V1::UsersController < V1::ApplicationController # rubocop:disable Metrics/ClassLength
22
include SpreadsheetHelper
3+
34
before_action :doorkeeper_authorize!, except: %i[activate_account reset_password
45
get_related_resource]
56
before_action :set_model, only: %i[update archive activate_account

app/jobs/collection_import_job.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
class CollectionImportJob < ApplicationJob
44
include SpreadsheetHelper
5+
56
queue_as :default
67

78
def perform(base64_data, collection, job_user)

0 commit comments

Comments
 (0)