Skip to content

Commit da27cc4

Browse files
authored
Merge pull request #31 from nativeapptemplate/chore/update-pagy-gem
update pagy gem from 9.x to 43 and fix vulnerabilities
2 parents c0a9b84 + feca041 commit da27cc4

5 files changed

Lines changed: 79 additions & 76 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ gem "after_commit_everywhere", "~> 1.4"
5050
gem "config"
5151
gem "acts_as_tenant"
5252
gem "inline_svg", "~> 1.6"
53-
gem "pagy", "~> 9.0"
53+
gem "pagy", "~> 43"
5454
gem "seed-fu", "~> 2.3"
5555
gem "whenever", require: false
5656
gem "madmin", github: "excid3/madmin"

Gemfile.lock

Lines changed: 74 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -15,68 +15,68 @@ GEM
1515
specs:
1616
aasm (5.5.2)
1717
concurrent-ruby (~> 1.0)
18-
action_text-trix (2.1.17)
18+
action_text-trix (2.1.18)
1919
railties
20-
actioncable (8.1.2)
21-
actionpack (= 8.1.2)
22-
activesupport (= 8.1.2)
20+
actioncable (8.1.3)
21+
actionpack (= 8.1.3)
22+
activesupport (= 8.1.3)
2323
nio4r (~> 2.0)
2424
websocket-driver (>= 0.6.1)
2525
zeitwerk (~> 2.6)
26-
actionmailbox (8.1.2)
27-
actionpack (= 8.1.2)
28-
activejob (= 8.1.2)
29-
activerecord (= 8.1.2)
30-
activestorage (= 8.1.2)
31-
activesupport (= 8.1.2)
26+
actionmailbox (8.1.3)
27+
actionpack (= 8.1.3)
28+
activejob (= 8.1.3)
29+
activerecord (= 8.1.3)
30+
activestorage (= 8.1.3)
31+
activesupport (= 8.1.3)
3232
mail (>= 2.8.0)
33-
actionmailer (8.1.2)
34-
actionpack (= 8.1.2)
35-
actionview (= 8.1.2)
36-
activejob (= 8.1.2)
37-
activesupport (= 8.1.2)
33+
actionmailer (8.1.3)
34+
actionpack (= 8.1.3)
35+
actionview (= 8.1.3)
36+
activejob (= 8.1.3)
37+
activesupport (= 8.1.3)
3838
mail (>= 2.8.0)
3939
rails-dom-testing (~> 2.2)
40-
actionpack (8.1.2)
41-
actionview (= 8.1.2)
42-
activesupport (= 8.1.2)
40+
actionpack (8.1.3)
41+
actionview (= 8.1.3)
42+
activesupport (= 8.1.3)
4343
nokogiri (>= 1.8.5)
4444
rack (>= 2.2.4)
4545
rack-session (>= 1.0.1)
4646
rack-test (>= 0.6.3)
4747
rails-dom-testing (~> 2.2)
4848
rails-html-sanitizer (~> 1.6)
4949
useragent (~> 0.16)
50-
actiontext (8.1.2)
50+
actiontext (8.1.3)
5151
action_text-trix (~> 2.1.15)
52-
actionpack (= 8.1.2)
53-
activerecord (= 8.1.2)
54-
activestorage (= 8.1.2)
55-
activesupport (= 8.1.2)
52+
actionpack (= 8.1.3)
53+
activerecord (= 8.1.3)
54+
activestorage (= 8.1.3)
55+
activesupport (= 8.1.3)
5656
globalid (>= 0.6.0)
5757
nokogiri (>= 1.8.5)
58-
actionview (8.1.2)
59-
activesupport (= 8.1.2)
58+
actionview (8.1.3)
59+
activesupport (= 8.1.3)
6060
builder (~> 3.1)
6161
erubi (~> 1.11)
6262
rails-dom-testing (~> 2.2)
6363
rails-html-sanitizer (~> 1.6)
64-
activejob (8.1.2)
65-
activesupport (= 8.1.2)
64+
activejob (8.1.3)
65+
activesupport (= 8.1.3)
6666
globalid (>= 0.3.6)
67-
activemodel (8.1.2)
68-
activesupport (= 8.1.2)
69-
activerecord (8.1.2)
70-
activemodel (= 8.1.2)
71-
activesupport (= 8.1.2)
67+
activemodel (8.1.3)
68+
activesupport (= 8.1.3)
69+
activerecord (8.1.3)
70+
activemodel (= 8.1.3)
71+
activesupport (= 8.1.3)
7272
timeout (>= 0.4.0)
73-
activestorage (8.1.2)
74-
actionpack (= 8.1.2)
75-
activejob (= 8.1.2)
76-
activerecord (= 8.1.2)
77-
activesupport (= 8.1.2)
73+
activestorage (8.1.3)
74+
actionpack (= 8.1.3)
75+
activejob (= 8.1.3)
76+
activerecord (= 8.1.3)
77+
activesupport (= 8.1.3)
7878
marcel (~> 1.0)
79-
activesupport (8.1.2)
79+
activesupport (8.1.3)
8080
base64
8181
bigdecimal
8282
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -98,15 +98,15 @@ GEM
9898
activesupport
9999
ast (2.4.3)
100100
base64 (0.3.0)
101-
bcrypt (3.1.21)
101+
bcrypt (3.1.22)
102102
better_html (2.2.0)
103103
actionview (>= 7.0)
104104
activesupport (>= 7.0)
105105
ast (~> 2.0)
106106
erubi (~> 1.4)
107107
parser (>= 2.4)
108108
smart_properties
109-
bigdecimal (4.0.1)
109+
bigdecimal (4.1.0)
110110
bindex (0.8.1)
111111
bootsnap (1.23.0)
112112
msgpack (~> 1.2)
@@ -203,7 +203,7 @@ GEM
203203
jbuilder (2.14.1)
204204
actionview (>= 7.0.0)
205205
activesupport (>= 7.0.0)
206-
json (2.19.0)
206+
json (2.19.3)
207207
json-schema (6.2.0)
208208
addressable (~> 2.8)
209209
bigdecimal (>= 3.1, < 5)
@@ -212,7 +212,7 @@ GEM
212212
language_server-protocol (3.17.0.5)
213213
lint_roller (1.1.0)
214214
logger (1.7.0)
215-
loofah (2.25.0)
215+
loofah (2.25.1)
216216
crass (~> 1.0.2)
217217
nokogiri (>= 1.12.0)
218218
mail (2.9.0)
@@ -227,13 +227,13 @@ GEM
227227
turbo-rails
228228
marcel (1.1.0)
229229
matrix (0.4.3)
230-
mcp (0.8.0)
230+
mcp (0.10.0)
231231
json-schema (>= 4.1)
232232
mini_magick (5.3.1)
233233
logger
234234
mini_mime (1.1.5)
235235
mini_portile2 (2.8.9)
236-
minitest (6.0.2)
236+
minitest (6.0.3)
237237
drb (~> 2.0)
238238
prism (~> 1.5)
239239
minitest-mock (5.27.0)
@@ -260,26 +260,29 @@ GEM
260260
net-smtp (0.5.1)
261261
net-protocol
262262
nio4r (2.7.5)
263-
nokogiri (1.19.1)
263+
nokogiri (1.19.2)
264264
mini_portile2 (~> 2.8.2)
265265
racc (~> 1.4)
266-
nokogiri (1.19.1-aarch64-linux-gnu)
266+
nokogiri (1.19.2-aarch64-linux-gnu)
267267
racc (~> 1.4)
268-
nokogiri (1.19.1-arm-linux-gnu)
268+
nokogiri (1.19.2-arm-linux-gnu)
269269
racc (~> 1.4)
270-
nokogiri (1.19.1-arm64-darwin)
270+
nokogiri (1.19.2-arm64-darwin)
271271
racc (~> 1.4)
272-
nokogiri (1.19.1-x86_64-darwin)
272+
nokogiri (1.19.2-x86_64-darwin)
273273
racc (~> 1.4)
274-
nokogiri (1.19.1-x86_64-linux-gnu)
274+
nokogiri (1.19.2-x86_64-linux-gnu)
275275
racc (~> 1.4)
276276
orm_adapter (0.5.0)
277277
ostruct (0.6.3)
278278
overcommit (0.68.0)
279279
childprocess (>= 0.6.3, < 6)
280280
iniparse (~> 1.4)
281281
rexml (>= 3.3.9)
282-
pagy (9.4.0)
282+
pagy (43.4.4)
283+
json
284+
uri
285+
yaml
283286
parallel (1.27.0)
284287
parser (3.3.10.2)
285288
ast (~> 2.4.1)
@@ -307,7 +310,7 @@ GEM
307310
activesupport (>= 3.0.0)
308311
raabro (1.4.0)
309312
racc (1.8.1)
310-
rack (3.2.5)
313+
rack (3.2.6)
311314
rack-attack (6.8.0)
312315
rack (>= 1.0, < 4)
313316
rack-session (2.1.1)
@@ -317,30 +320,30 @@ GEM
317320
rack (>= 1.3)
318321
rackup (2.3.1)
319322
rack (>= 3)
320-
rails (8.1.2)
321-
actioncable (= 8.1.2)
322-
actionmailbox (= 8.1.2)
323-
actionmailer (= 8.1.2)
324-
actionpack (= 8.1.2)
325-
actiontext (= 8.1.2)
326-
actionview (= 8.1.2)
327-
activejob (= 8.1.2)
328-
activemodel (= 8.1.2)
329-
activerecord (= 8.1.2)
330-
activestorage (= 8.1.2)
331-
activesupport (= 8.1.2)
323+
rails (8.1.3)
324+
actioncable (= 8.1.3)
325+
actionmailbox (= 8.1.3)
326+
actionmailer (= 8.1.3)
327+
actionpack (= 8.1.3)
328+
actiontext (= 8.1.3)
329+
actionview (= 8.1.3)
330+
activejob (= 8.1.3)
331+
activemodel (= 8.1.3)
332+
activerecord (= 8.1.3)
333+
activestorage (= 8.1.3)
334+
activesupport (= 8.1.3)
332335
bundler (>= 1.15.0)
333-
railties (= 8.1.2)
336+
railties (= 8.1.3)
334337
rails-dom-testing (2.3.0)
335338
activesupport (>= 5.0.0)
336339
minitest
337340
nokogiri (>= 1.6)
338341
rails-html-sanitizer (1.7.0)
339342
loofah (~> 2.25)
340343
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
341-
railties (8.1.2)
342-
actionpack (= 8.1.2)
343-
activesupport (= 8.1.2)
344+
railties (8.1.3)
345+
actionpack (= 8.1.3)
346+
activesupport (= 8.1.3)
344347
irb (~> 1.13)
345348
rackup (>= 1.0.0)
346349
rake (>= 12.2)
@@ -436,7 +439,7 @@ GEM
436439
tailwindcss-ruby (3.4.19-x86_64-darwin)
437440
tailwindcss-ruby (3.4.19-x86_64-linux)
438441
thor (1.5.0)
439-
timeout (0.6.0)
442+
timeout (0.6.1)
440443
tsort (0.2.0)
441444
turbo-rails (2.0.23)
442445
actionpack (>= 7.1.0)
@@ -470,6 +473,7 @@ GEM
470473
chronic (>= 0.6.3)
471474
xpath (3.2.0)
472475
nokogiri (~> 1.8)
476+
yaml (0.4.0)
473477
zeitwerk (2.7.5)
474478

475479
PLATFORMS
@@ -504,7 +508,7 @@ DEPENDENCIES
504508
mission_control-jobs
505509
nokogiri (>= 1.12.5)
506510
overcommit
507-
pagy (~> 9.0)
511+
pagy (~> 43)
508512
pg
509513
propshaft (~> 1.0)
510514
puma (~> 7.0)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Display
22
class BaseController < NonApiApplicationController
3-
include Pagy::Backend
3+
include Pagy::Method
44
end
55
end

app/controllers/display/item_tags_controller.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ class Display::ItemTagsController < Display::BaseController
44
def completings
55
items_count = 9
66

7-
# Use pagy method because pagy_countless method causes Pagy::OverflowError.
87
@pagy, @completed_item_tags = pagy(
98
@shop.item_tags.completed.sorted,
10-
limit: items_count,
11-
cycle: true
9+
limit: items_count
1210
)
1311

1412
@type = params[:type]

config/bundler-audit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
# CVEs that are not relevant to the application can be enumerated on the ignore list below.
33

44
ignore:
5-
- CVE-THAT-DOES-NOT-APPLY
5+
# devise 5.0.3+ fixes this, but devise_token_auth ~> 1.2 pins devise < 5
6+
- CVE-2026-32700

0 commit comments

Comments
 (0)