Skip to content

Commit 1407358

Browse files
jonny5jonny5
committed
Merge remote-tracking branch 'upstream/main' into em/5056-import-partners
2 parents 023a1a4 + 6ef39a4 commit 1407358

File tree

4 files changed

+34
-35
lines changed

4 files changed

+34
-35
lines changed

‎Gemfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ GEM
111111
net-http-persistent (~> 4.0)
112112
nokogiri (~> 1, >= 1.10.8)
113113
base64 (0.3.0)
114-
bcrypt (3.1.20)
114+
bcrypt (3.1.21)
115115
benchmark (0.5.0)
116116
better_errors (2.10.1)
117117
erubi (>= 1.0.0)
@@ -124,7 +124,7 @@ GEM
124124
erubi (~> 1.4)
125125
parser (>= 2.4)
126126
smart_properties
127-
bigdecimal (3.3.1)
127+
bigdecimal (4.0.1)
128128
bindex (0.8.1)
129129
binding_of_caller (1.0.1)
130130
debug_inspector (>= 1.2.0)
@@ -134,9 +134,9 @@ GEM
134134
autoprefixer-rails (>= 9.1.0)
135135
popper_js (>= 2.11.6, < 3)
136136
sassc-rails (>= 2.0.0)
137-
brakeman (7.1.0)
137+
brakeman (8.0.2)
138138
racc
139-
bugsnag (6.28.0)
139+
bugsnag (6.29.0)
140140
concurrent-ruby (~> 1.0)
141141
builder (3.3.0)
142142
bullet (8.1.0)
@@ -175,7 +175,7 @@ GEM
175175
database_cleaner-core (~> 2.0)
176176
database_cleaner-core (2.0.1)
177177
date (3.5.1)
178-
debug (1.11.0)
178+
debug (1.11.1)
179179
irb (~> 1.10)
180180
reline (>= 0.3.8)
181181
debug_inspector (1.2.0)
@@ -189,10 +189,10 @@ GEM
189189
delayed_job (> 2.0.3)
190190
rack-protection (>= 1.5.5)
191191
sinatra (>= 1.4.4)
192-
devise (4.9.4)
192+
devise (5.0.0)
193193
bcrypt (~> 3.0)
194194
orm_adapter (~> 0.1)
195-
railties (>= 4.1.0)
195+
railties (>= 7.0)
196196
responders
197197
warden (~> 1.2.3)
198198
devise_invitable (2.0.11)
@@ -222,8 +222,8 @@ GEM
222222
dry-types (~> 1.8, >= 1.8.2)
223223
ice_nine (~> 0.11)
224224
zeitwerk (~> 2.6)
225-
dry-types (1.8.2)
226-
bigdecimal (~> 3.0)
225+
dry-types (1.9.0)
226+
bigdecimal (>= 3.0)
227227
concurrent-ruby (~> 1.0)
228228
dry-core (~> 1.0)
229229
dry-inflector (~> 1.0)
@@ -244,7 +244,7 @@ GEM
244244
factory_bot_rails (6.5.1)
245245
factory_bot (~> 6.5)
246246
railties (>= 6.1.0)
247-
faker (3.5.3)
247+
faker (3.6.0)
248248
i18n (>= 1.8.11, < 2)
249249
faraday (1.10.4)
250250
faraday-em_http (~> 1.0)
@@ -329,7 +329,7 @@ GEM
329329
ostruct
330330
ice_cube (0.17.0)
331331
ice_nine (0.11.2)
332-
importmap-rails (2.2.2)
332+
importmap-rails (2.2.3)
333333
actionpack (>= 6.0.0)
334334
activesupport (>= 6.0.0)
335335
railties (>= 6.0.0)
@@ -357,7 +357,7 @@ GEM
357357
activerecord
358358
kaminari-core (= 1.2.2)
359359
kaminari-core (1.2.2)
360-
knapsack_pro (8.4.0)
360+
knapsack_pro (9.2.1)
361361
rake
362362
language_server-protocol (3.17.0.5)
363363
launchy (3.0.0)
@@ -403,14 +403,14 @@ GEM
403403
money (7.0.2)
404404
bigdecimal
405405
i18n (~> 1.9)
406-
money-rails (2.0.0)
407-
activesupport (>= 6.1)
406+
money-rails (3.0.0)
407+
activesupport (>= 7.0)
408408
monetize (~> 2.0)
409409
money (~> 7.0)
410-
railties (>= 6.1)
410+
railties (>= 7.0)
411411
msgpack (1.8.0)
412-
multi_xml (0.7.2)
413-
bigdecimal (~> 3.1)
412+
multi_xml (0.8.1)
413+
bigdecimal (>= 3.1, < 5)
414414
multipart-post (2.4.1)
415415
mustermann (3.0.0)
416416
ruby2_keywords (~> 0.0.1)
@@ -428,11 +428,11 @@ GEM
428428
net-protocol
429429
newrelic_rpm (9.24.0)
430430
nio4r (2.7.5)
431-
nokogiri (1.18.10-arm64-darwin)
431+
nokogiri (1.19.0-arm64-darwin)
432432
racc (~> 1.4)
433-
nokogiri (1.18.10-x86_64-darwin)
433+
nokogiri (1.19.0-x86_64-darwin)
434434
racc (~> 1.4)
435-
nokogiri (1.18.10-x86_64-linux-gnu)
435+
nokogiri (1.19.0-x86_64-linux-gnu)
436436
racc (~> 1.4)
437437
notiffany (0.1.3)
438438
nenv (~> 0.1)
@@ -473,7 +473,7 @@ GEM
473473
ast (~> 2.4.1)
474474
racc
475475
pdf-core (0.9.0)
476-
pdf-reader (2.15.0)
476+
pdf-reader (2.15.1)
477477
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
478478
afm (>= 0.2.1, < 2)
479479
hashery (~> 2.0)
@@ -496,7 +496,7 @@ GEM
496496
prawn-table (0.2.2)
497497
prawn (>= 1.3.0, < 3.0.0)
498498
prettyprint (0.2.0)
499-
prism (1.7.0)
499+
prism (1.9.0)
500500
pry (0.14.2)
501501
coderay (~> 1.1)
502502
method_source (~> 1.0)
@@ -577,7 +577,7 @@ GEM
577577
rb-fsevent (0.11.2)
578578
rb-inotify (0.10.1)
579579
ffi (~> 1.0)
580-
rdoc (7.0.3)
580+
rdoc (7.1.0)
581581
erb
582582
psych (>= 4.0.0)
583583
tsort
@@ -587,9 +587,9 @@ GEM
587587
io-console (~> 0.5)
588588
request_store (1.7.0)
589589
rack (>= 1.4)
590-
responders (3.1.1)
591-
actionpack (>= 5.2)
592-
railties (>= 5.2)
590+
responders (3.2.0)
591+
actionpack (>= 7.0)
592+
railties (>= 7.0)
593593
rexml (3.4.4)
594594
rolify (6.0.1)
595595
rouge (4.1.2)
@@ -716,7 +716,7 @@ GEM
716716
activerecord (>= 7.1)
717717
terser (1.2.6)
718718
execjs (>= 0.3.0, < 3)
719-
thor (1.4.0)
719+
thor (1.5.0)
720720
tilt (2.2.0)
721721
timeout (0.4.4)
722722
tsort (0.2.0)

‎config/brakeman.ignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
{
44
"warning_type": "Command Injection",
55
"warning_code": 14,
6-
"fingerprint": "5dd8c58cca239b1a2527f25255c49c8800a31e5ec8cb8e31e14003fc435dd677",
6+
"fingerprint": "39737ba6e95438831a89d919ed74a3e4d522d94a9993f7a6bc8d1cff9e699132",
77
"check_name": "Execute",
88
"message": "Possible command injection",
99
"file": "app/jobs/backup_db_rds.rb",
10-
"line": 11,
10+
"line": 13,
1111
"link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
1212
"code": "system(\"PGPASSWORD='#{ENV[\"DIAPER_DB_PASSWORD\"]}' pg_dump -Fc -v --host=#{ENV[\"DIAPER_DB_HOST\"]} --username=#{ENV[\"DIAPER_DB_USERNAME\"]} --dbname=#{ENV[\"DIAPER_DB_DATABASE\"]} -f #{\"#{Time.current.strftime(\"%Y%m%d%H%M%S\")}.rds.dump\"}\")",
1313
"render_path": null,
1414
"location": {
1515
"type": "method",
1616
"class": "BackupDbRds",
17-
"method": "s(:self).run"
17+
"method": "self.run"
1818
},
1919
"user_input": "ENV[\"DIAPER_DB_PASSWORD\"]",
2020
"confidence": "Medium",
@@ -30,7 +30,7 @@
3030
"check_name": "Render",
3131
"message": "Render path contains parameter value",
3232
"file": "app/controllers/static_controller.rb",
33-
"line": 20,
33+
"line": 21,
3434
"link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
3535
"code": "render(template => \"static/#{params[:name]}\", {})",
3636
"render_path": null,
@@ -47,6 +47,5 @@
4747
"note": ""
4848
}
4949
],
50-
"updated": "2024-11-24 10:40:00 -0500",
51-
"brakeman_version": "6.2.1"
50+
"brakeman_version": "8.0.2"
5251
}

‎spec/system/log_in_system_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
fill_in "user_email", with: "[email protected]"
3535
fill_in "user_password", with: DEFAULT_USER_PASSWORD
3636
find('input[name="commit"]').click
37-
expect(page).to have_content("Invalid Email or password")
37+
expect(page).to have_content("Invalid email or password")
3838
end
3939
end
4040

‎spec/system/sign_in_system_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
fill_in "Password", with: 'invalid_password'
1515
click_button "Log in"
1616

17-
expect(page).to have_content('Invalid Email or password.')
17+
expect(page).to have_content('Invalid email or password.')
1818
end
1919
end
2020

0 commit comments

Comments
 (0)