Skip to content

Commit 44d2484

Browse files
chore(deps): update dependency sidekiq to v8 (#1036)
* chore(deps): update dependency sidekiq to v8 * Update Gemfile * generate gemfile.lock * update to rack 3.1 standards --------- 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 a0bca85 commit 44d2484

File tree

8 files changed

+41
-36
lines changed

8 files changed

+41
-36
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ gem 'sassc-rails', '~> 2.1.2'
3333
gem 'sentry-rails', '~> 5.24'
3434
gem 'sentry-ruby', '~> 5.24'
3535
gem 'sentry-sidekiq', '~> 5.24'
36-
gem 'sidekiq', '~> 7.3.9'
36+
gem 'sidekiq', '~> 8.0.3'
3737
gem 'sidekiq-scheduler', '~> 6.0.1'
3838
gem 'simple_form', '~> 5.3.1'
3939
gem 'turbolinks', '~> 5.2.1'

Gemfile.lock

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,13 @@ GEM
292292
notiffany (0.1.3)
293293
nenv (~> 0.1)
294294
shellany (~> 0.0)
295-
oauth2 (1.4.9)
295+
oauth2 (2.0.9)
296296
faraday (>= 0.17.3, < 3.0)
297297
jwt (>= 1.0, < 3.0)
298-
multi_json (~> 1.3)
299298
multi_xml (~> 0.5)
300-
rack (>= 1.2, < 3)
299+
rack (>= 1.2, < 4)
300+
snaky_hash (~> 2.0)
301+
version_gem (~> 1.1)
301302
omniauth (2.1.3)
302303
hashie (>= 3.4.6)
303304
rack (>= 2.2.3)
@@ -342,20 +343,20 @@ GEM
342343
activesupport (>= 3.0.0)
343344
raabro (1.4.0)
344345
racc (1.8.1)
345-
rack (2.2.16)
346+
rack (3.1.14)
346347
rack-attack (6.7.0)
347348
rack (>= 1.0, < 4)
348349
rack-protection (3.0.6)
349350
rack
350351
rack-proxy (0.7.2)
351352
rack
352-
rack-session (1.0.2)
353-
rack (< 3)
353+
rack-session (2.1.1)
354+
base64 (>= 0.1.0)
355+
rack (>= 3.0.0)
354356
rack-test (2.2.0)
355357
rack (>= 1.3)
356-
rackup (1.0.1)
357-
rack (< 3)
358-
webrick
358+
rackup (2.2.1)
359+
rack (>= 3)
359360
rails (7.1.5.1)
360361
actioncable (= 7.1.5.1)
361362
actionmailbox (= 7.1.5.1)
@@ -401,17 +402,17 @@ GEM
401402
rdoc (6.13.1)
402403
psych (>= 4.0.0)
403404
redis (4.8.1)
404-
redis-actionpack (5.3.0)
405-
actionpack (>= 5, < 8)
406-
redis-rack (>= 2.1.0, < 3)
405+
redis-actionpack (5.5.0)
406+
actionpack (>= 5)
407+
redis-rack (>= 2.1.0, < 4)
407408
redis-store (>= 1.1.0, < 2)
408409
redis-activesupport (5.3.0)
409410
activesupport (>= 3, < 8)
410411
redis-store (>= 1.3, < 2)
411412
redis-client (0.24.0)
412413
connection_pool
413-
redis-rack (2.1.4)
414-
rack (>= 2.0.8, < 3)
414+
redis-rack (3.0.0)
415+
rack-session (>= 0.2.0)
415416
redis-store (>= 1.2, < 2)
416417
redis-rails (5.0.2)
417418
redis-actionpack (>= 5.0, < 6)
@@ -512,12 +513,12 @@ GEM
512513
sentry-ruby (~> 5.24.0)
513514
sidekiq (>= 3.0)
514515
shellany (0.0.1)
515-
sidekiq (7.3.9)
516-
base64
517-
connection_pool (>= 2.3.0)
518-
logger
519-
rack (>= 2.2.4)
520-
redis-client (>= 0.22.2)
516+
sidekiq (8.0.3)
517+
connection_pool (>= 2.5.0)
518+
json (>= 2.9.0)
519+
logger (>= 1.6.2)
520+
rack (>= 3.1.0)
521+
redis-client (>= 0.23.2)
521522
sidekiq-scheduler (6.0.1)
522523
rufus-scheduler (~> 3.2)
523524
sidekiq (>= 7.3, < 9)
@@ -531,15 +532,19 @@ GEM
531532
simplecov-html (0.12.3)
532533
simplecov-lcov (0.8.0)
533534
simplecov_json_formatter (0.1.4)
535+
snaky_hash (2.0.1)
536+
hashie
537+
version_gem (~> 1.1, >= 1.1.1)
534538
spring (4.3.0)
535539
spring-commands-rspec (1.0.4)
536540
spring (>= 0.9.1)
537541
spring-watcher-listen (2.1.0)
538542
listen (>= 2.7, < 4.0)
539543
spring (>= 4)
540-
sprockets (4.0.3)
544+
sprockets (4.2.2)
541545
concurrent-ruby (~> 1.0)
542-
rack (> 1, < 3)
546+
logger
547+
rack (>= 2.2.4, < 4)
543548
sprockets-rails (3.4.2)
544549
actionpack (>= 5.2)
545550
activesupport (>= 5.2)
@@ -575,6 +580,7 @@ GEM
575580
validates_timeliness (7.1.0)
576581
activemodel (>= 7.0.0, < 8)
577582
timeliness (>= 0.3.10, < 1)
583+
version_gem (1.1.8)
578584
warden (1.2.9)
579585
rack (>= 2.0.9)
580586
web-console (4.2.1)
@@ -587,7 +593,6 @@ GEM
587593
rack-proxy (>= 0.6.1)
588594
railties (>= 5.2)
589595
semantic_range (>= 2.3.0)
590-
webrick (1.9.1)
591596
websocket-driver (0.7.7)
592597
base64
593598
websocket-extensions (>= 0.1.0)
@@ -660,7 +665,7 @@ DEPENDENCIES
660665
sentry-rails (~> 5.24)
661666
sentry-ruby (~> 5.24)
662667
sentry-sidekiq (~> 5.24)
663-
sidekiq (~> 7.3.9)
668+
sidekiq (~> 8.0.3)
664669
sidekiq-scheduler (~> 6.0.1)
665670
simple_form (~> 5.3.1)
666671
simplecov (~> 0.22.0)

app/controllers/credit_mutations_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def create # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
2727

2828
else
2929
format.html { redirect_to which_redirect?, flash: { error: @mutation.errors.full_messages.join(', ') } }
30-
format.json { render json: @mutation.errors, status: :unprocessable_entity }
30+
format.json { render json: @mutation.errors, status: :unprocessable_content }
3131
end
3232
end
3333
end

app/controllers/errors_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def not_found
88
end
99

1010
def unacceptable
11-
render status: :unprocessable_entity
11+
render status: :unprocessable_content
1212
end
1313

1414
def internal_server_error

app/controllers/orders_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def create # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
3434
order_data.user.current_activity = order_data.activity unless order_data.user.nil?
3535
render json: order_data.as_json(include: json_includes)
3636
else
37-
render json: @order.errors, status: :unprocessable_entity
37+
render json: @order.errors, status: :unprocessable_content
3838
end
3939
end
4040

@@ -46,7 +46,7 @@ def update
4646
if @order.update(permitted_attributes_on_update)
4747
render json: @order.to_json(proper_json)
4848
else
49-
render json: @order.errors, status: :unprocessable_entity
49+
render json: @order.errors, status: :unprocessable_content
5050
end
5151
end
5252

app/controllers/price_lists_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def archive
5454
if @price_list.save
5555
format.json { render json: @price_list.archived_at }
5656
else
57-
format.json { render json: @price_list.errors, status: :unprocessable_entity }
57+
format.json { render json: @price_list.errors, status: :unprocessable_content }
5858
end
5959
end
6060
end
@@ -69,7 +69,7 @@ def unarchive
6969
if @price_list.save
7070
format.json { render json: @price_list.archived_at }
7171
else
72-
format.json { render json: @price_list.errors, status: :unprocessable_entity }
72+
format.json { render json: @price_list.errors, status: :unprocessable_content }
7373
end
7474
end
7575
end

app/controllers/products_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def create
1111
if @product.save
1212
render json: @product, include: json_includes, except: json_exludes, methods: :t_category
1313
else
14-
render json: @product.errors, status: :unprocessable_entity
14+
render json: @product.errors, status: :unprocessable_content
1515
end
1616
end
1717

@@ -21,7 +21,7 @@ def update
2121
if @product.update(permitted_attributes)
2222
render json: @product, include: json_includes, except: json_exludes, methods: :t_category
2323
else
24-
render json: @product.errors, status: :unprocessable_entity
24+
render json: @product.errors, status: :unprocessable_content
2525
end
2626
end
2727

spec/controllers/orders_controller/update_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
it 'when with order on locked activity' do
5757
request_on_locked_activity
58-
expect(response).to have_http_status(:unprocessable_entity)
58+
expect(response).to have_http_status(:unprocessable_content)
5959
expect(Order.first.order_rows.last.product_count).to eq 2
6060
end
6161
end
@@ -71,7 +71,7 @@
7171

7272
it 'when with order on locked activity' do
7373
request_on_locked_activity
74-
expect(response).to have_http_status(:unprocessable_entity)
74+
expect(response).to have_http_status(:unprocessable_content)
7575
expect(Order.first.order_rows.last.product_count).to eq 2
7676
end
7777
end
@@ -87,7 +87,7 @@
8787

8888
it 'when with order on locked activity' do
8989
request_on_locked_activity
90-
expect(response).to have_http_status(:unprocessable_entity)
90+
expect(response).to have_http_status(:unprocessable_content)
9191
expect(Order.first.order_rows.last.product_count).to eq 2
9292
end
9393
end

0 commit comments

Comments
 (0)