Skip to content

Commit aaa2d72

Browse files
authored
Merge pull request #428 from impactoss/master
update from master
2 parents 8e49490 + 309f2a7 commit aaa2d72

File tree

4 files changed

+612
-264
lines changed

4 files changed

+612
-264
lines changed

.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ gem "kaminari"
1717
gem "net-smtp"
1818
gem "paper_trail"
1919
gem "pg", "~> 1.2"
20-
gem "puma", "~> 5.5"
20+
gem "puma", "~> 5.6"
2121
gem "pundit"
2222
gem "rack-cors", require: "rack/cors"
2323
gem "rails", "~> 6.0"

Gemfile.lock

+73-73
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.6)
5-
actionpack (= 6.1.7.6)
6-
activesupport (= 6.1.7.6)
4+
actioncable (6.1.7.9)
5+
actionpack (= 6.1.7.9)
6+
activesupport (= 6.1.7.9)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.6)
10-
actionpack (= 6.1.7.6)
11-
activejob (= 6.1.7.6)
12-
activerecord (= 6.1.7.6)
13-
activestorage (= 6.1.7.6)
14-
activesupport (= 6.1.7.6)
9+
actionmailbox (6.1.7.9)
10+
actionpack (= 6.1.7.9)
11+
activejob (= 6.1.7.9)
12+
activerecord (= 6.1.7.9)
13+
activestorage (= 6.1.7.9)
14+
activesupport (= 6.1.7.9)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.7.6)
17-
actionpack (= 6.1.7.6)
18-
actionview (= 6.1.7.6)
19-
activejob (= 6.1.7.6)
20-
activesupport (= 6.1.7.6)
16+
actionmailer (6.1.7.9)
17+
actionpack (= 6.1.7.9)
18+
actionview (= 6.1.7.9)
19+
activejob (= 6.1.7.9)
20+
activesupport (= 6.1.7.9)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.6)
24-
actionview (= 6.1.7.6)
25-
activesupport (= 6.1.7.6)
23+
actionpack (6.1.7.9)
24+
actionview (= 6.1.7.9)
25+
activesupport (= 6.1.7.9)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.7.6)
31-
actionpack (= 6.1.7.6)
32-
activerecord (= 6.1.7.6)
33-
activestorage (= 6.1.7.6)
34-
activesupport (= 6.1.7.6)
30+
actiontext (6.1.7.9)
31+
actionpack (= 6.1.7.9)
32+
activerecord (= 6.1.7.9)
33+
activestorage (= 6.1.7.9)
34+
activesupport (= 6.1.7.9)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.6)
37-
activesupport (= 6.1.7.6)
36+
actionview (6.1.7.9)
37+
activesupport (= 6.1.7.9)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
4141
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42-
activejob (6.1.7.6)
43-
activesupport (= 6.1.7.6)
42+
activejob (6.1.7.9)
43+
activesupport (= 6.1.7.9)
4444
globalid (>= 0.3.6)
45-
activemodel (6.1.7.6)
46-
activesupport (= 6.1.7.6)
47-
activerecord (6.1.7.6)
48-
activemodel (= 6.1.7.6)
49-
activesupport (= 6.1.7.6)
50-
activestorage (6.1.7.6)
51-
actionpack (= 6.1.7.6)
52-
activejob (= 6.1.7.6)
53-
activerecord (= 6.1.7.6)
54-
activesupport (= 6.1.7.6)
45+
activemodel (6.1.7.9)
46+
activesupport (= 6.1.7.9)
47+
activerecord (6.1.7.9)
48+
activemodel (= 6.1.7.9)
49+
activesupport (= 6.1.7.9)
50+
activestorage (6.1.7.9)
51+
actionpack (= 6.1.7.9)
52+
activejob (= 6.1.7.9)
53+
activerecord (= 6.1.7.9)
54+
activesupport (= 6.1.7.9)
5555
marcel (~> 1.0)
5656
mini_mime (>= 1.1.0)
57-
activesupport (6.1.7.6)
57+
activesupport (6.1.7.9)
5858
concurrent-ruby (~> 1.0, >= 1.0.2)
5959
i18n (>= 1.6, < 2)
6060
minitest (>= 5.1)
@@ -81,7 +81,7 @@ GEM
8181
debug_inspector (>= 0.0.1)
8282
brakeman (6.1.1)
8383
racc
84-
builder (3.2.4)
84+
builder (3.3.0)
8585
bundler-audit (0.9.1)
8686
bundler (>= 1.2.0, < 3)
8787
thor (~> 1.0)
@@ -100,7 +100,7 @@ GEM
100100
activesupport
101101
tzinfo
102102
coderay (1.1.3)
103-
concurrent-ruby (1.2.3)
103+
concurrent-ruby (1.3.4)
104104
connection_pool (2.4.1)
105105
crass (1.0.6)
106106
database_cleaner (2.0.2)
@@ -109,7 +109,7 @@ GEM
109109
activerecord (>= 5.a)
110110
database_cleaner-core (~> 2.0.0)
111111
database_cleaner-core (2.0.1)
112-
date (3.3.4)
112+
date (3.4.1)
113113
debug_inspector (1.2.0)
114114
devise (4.9.3)
115115
bcrypt (~> 3.0)
@@ -127,7 +127,7 @@ GEM
127127
dotenv-rails (2.8.1)
128128
dotenv (= 2.8.1)
129129
railties (>= 3.2)
130-
erubi (1.12.0)
130+
erubi (1.13.0)
131131
excon (0.109.0)
132132
execjs (2.9.1)
133133
factory_bot (6.4.5)
@@ -166,7 +166,7 @@ GEM
166166
activesupport (>= 6.1)
167167
hashie (5.0.0)
168168
highline (3.0.1)
169-
i18n (1.14.4)
169+
i18n (1.14.6)
170170
concurrent-ruby (~> 1.0)
171171
i18n-tasks (0.9.37)
172172
activesupport (>= 4.0.2)
@@ -213,7 +213,7 @@ GEM
213213
listen (3.8.0)
214214
rb-fsevent (~> 0.10, >= 0.10.3)
215215
rb-inotify (~> 0.9, >= 0.9.10)
216-
loofah (2.22.0)
216+
loofah (2.23.1)
217217
crass (~> 1.0.2)
218218
nokogiri (>= 1.12.0)
219219
mail (2.8.1)
@@ -229,7 +229,7 @@ GEM
229229
mime-types-data (~> 3.2015)
230230
mime-types-data (3.2023.1205)
231231
mini_mime (1.1.5)
232-
minitest (5.22.3)
232+
minitest (5.25.4)
233233
multi_json (1.15.0)
234234
multi_xml (0.6.0)
235235
net-http (0.4.1)
@@ -243,10 +243,10 @@ GEM
243243
timeout
244244
net-smtp (0.4.0.1)
245245
net-protocol
246-
nio4r (2.7.0)
247-
nokogiri (1.16.0-arm64-darwin)
246+
nio4r (2.7.4)
247+
nokogiri (1.17.1-arm64-darwin)
248248
racc (~> 1.4)
249-
nokogiri (1.16.0-x86_64-linux)
249+
nokogiri (1.17.1-x86_64-linux)
250250
racc (~> 1.4)
251251
oauth2 (2.0.9)
252252
faraday (>= 0.17.3, < 3.0)
@@ -283,47 +283,47 @@ GEM
283283
pry-rails (0.3.9)
284284
pry (>= 0.10.4)
285285
public_suffix (5.0.4)
286-
puma (5.6.8)
286+
puma (5.6.9)
287287
nio4r (~> 2.0)
288288
pundit (2.3.1)
289289
activesupport (>= 3.0.0)
290-
racc (1.7.3)
291-
rack (2.2.8)
292-
rack-cors (2.0.1)
290+
racc (1.8.1)
291+
rack (2.2.10)
292+
rack-cors (2.0.2)
293293
rack (>= 2.0.0)
294294
rack-protection (3.2.0)
295295
base64 (>= 0.1.0)
296296
rack (~> 2.2, >= 2.2.4)
297297
rack-test (2.1.0)
298298
rack (>= 1.3)
299-
rails (6.1.7.6)
300-
actioncable (= 6.1.7.6)
301-
actionmailbox (= 6.1.7.6)
302-
actionmailer (= 6.1.7.6)
303-
actionpack (= 6.1.7.6)
304-
actiontext (= 6.1.7.6)
305-
actionview (= 6.1.7.6)
306-
activejob (= 6.1.7.6)
307-
activemodel (= 6.1.7.6)
308-
activerecord (= 6.1.7.6)
309-
activestorage (= 6.1.7.6)
310-
activesupport (= 6.1.7.6)
299+
rails (6.1.7.9)
300+
actioncable (= 6.1.7.9)
301+
actionmailbox (= 6.1.7.9)
302+
actionmailer (= 6.1.7.9)
303+
actionpack (= 6.1.7.9)
304+
actiontext (= 6.1.7.9)
305+
actionview (= 6.1.7.9)
306+
activejob (= 6.1.7.9)
307+
activemodel (= 6.1.7.9)
308+
activerecord (= 6.1.7.9)
309+
activestorage (= 6.1.7.9)
310+
activesupport (= 6.1.7.9)
311311
bundler (>= 1.15.0)
312-
railties (= 6.1.7.6)
312+
railties (= 6.1.7.9)
313313
sprockets-rails (>= 2.0.0)
314314
rails-dom-testing (2.2.0)
315315
activesupport (>= 5.0.0)
316316
minitest
317317
nokogiri (>= 1.6)
318-
rails-html-sanitizer (1.6.0)
318+
rails-html-sanitizer (1.6.1)
319319
loofah (~> 2.21)
320-
nokogiri (~> 1.14)
320+
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)
321321
rails-i18n (7.0.8)
322322
i18n (>= 0.7, < 2)
323323
railties (>= 6.0.0, < 8)
324-
railties (6.1.7.6)
325-
actionpack (= 6.1.7.6)
326-
activesupport (= 6.1.7.6)
324+
railties (6.1.7.9)
325+
actionpack (= 6.1.7.9)
326+
activesupport (= 6.1.7.9)
327327
method_source
328328
rake (>= 12.2)
329329
thor (~> 1.0)
@@ -338,7 +338,7 @@ GEM
338338
responders (3.1.1)
339339
actionpack (>= 5.2)
340340
railties (>= 5.2)
341-
rexml (3.2.6)
341+
rexml (3.3.9)
342342
rouge (4.2.0)
343343
rspec-core (3.12.2)
344344
rspec-support (~> 3.12.0)
@@ -430,7 +430,7 @@ GEM
430430
thor (1.3.0)
431431
tilt (2.3.0)
432432
timecop (0.9.8)
433-
timeout (0.4.1)
433+
timeout (0.4.2)
434434
tzinfo (2.0.6)
435435
concurrent-ruby (~> 1.0)
436436
unicode-display_width (2.5.0)
@@ -451,7 +451,7 @@ GEM
451451
zeitwerk (>= 2.6)
452452
xpath (3.2.0)
453453
nokogiri (~> 1.8)
454-
zeitwerk (2.6.13)
454+
zeitwerk (2.7.1)
455455

456456
PLATFORMS
457457
arm64-darwin-23
@@ -492,7 +492,7 @@ DEPENDENCIES
492492
paper_trail
493493
pg (~> 1.2)
494494
pry-rails
495-
puma (~> 5.5)
495+
puma (~> 5.6)
496496
pundit
497497
rack-cors
498498
rails (~> 6.0)

0 commit comments

Comments
 (0)