Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 1.7.3), rails-html-sanitizer (1.6.0 → 1.6.2) #4123

Merged
merged 15 commits into from
Jan 11, 2025

Conversation

orien
Copy link
Contributor

@orien orien commented Jan 10, 2025

Bump Node.js and Ruby.

  • Rubocop needed a bump to support Ruby 3.3, which resulted in a number of style corrections which I've accommodated. FYI: I put each Rubocop resolution change in a separate commit for easy review.

  • sqlite3 also needed a bump to support Ruby 3.3.

  • rails-html-sanitizer got a bump to resolve CVE-2024-53985, CVE-2024-53986, CVE-2024-53987, CVE-2024-53988 and CVE-2024-53989

@orien orien requested review from a team and grosser as code owners January 10, 2025 22:47
@orien orien changed the title Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0) Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 2.5.0) Jan 10, 2025
@orien orien force-pushed the dependency-update branch from b219945 to dfef7fc Compare January 10, 2025 22:59
@orien orien changed the title Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 2.5.0) Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 1.7.3) Jan 10, 2025
@orien orien force-pushed the dependency-update branch from dfef7fc to ae4824a Compare January 10, 2025 23:09
@orien orien force-pushed the dependency-update branch from 5b617e9 to 9d8472d Compare January 10, 2025 23:48
@orien orien changed the title Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 1.7.3) Bump Node.js (18.19.1 → 18.20.5), Ruby (3.2.5 → 3.3.6), Rubocop (1.42.0 → 1.70.0), sqlite3 (1.6.9 → 1.7.3), rails-html-sanitizer (1.6.0 → 1.6.2) Jan 10, 2025
@orien orien force-pushed the dependency-update branch from 9d8472d to 9558992 Compare January 11, 2025 00:14
@@ -4,3 +4,4 @@
# - leave file with `ignore: []` if ignore list is empty
ignore:
- CVE-2024-6484 # ignore until a patch is available https://github.com/advisories/GHSA-9mvj-f7w8-pvh2
- CVE-2024-54133 # ignore until Rails is upgraded to >= 7.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI got a PR for that read here #4120
... we are almost done with hosting samson ourselves, so if you can verify it works we can merge that too

@@ -5,7 +5,7 @@ def user_project_role_radio(user, role_name, role_id, user_project_role_id)
global_access = (user.role_id >= role_id.to_i)
disabled = (user.role_id > role_id.to_i)
project_access = (user_project_role_id.to_i >= role_id.to_i)
checked = (global_access || project_access)
checked = global_access || project_access
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI kinda like these assignment wrappers since it makes things clearer, but 🤷

@@ -20,7 +20,7 @@ def change
OutboundWebhook.find_each do |wh|
OutboundWebhookStage.create!(stage_id: wh.stage_id, outbound_webhook_id: wh.id) do |o|
o.created_at = wh.created_at
o.updated_at = o.updated_at
o.updated_at = wh.updated_at
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh nice catch!

@@ -55,7 +55,7 @@ def parsed_template
def validate_template
return errors.add :template, "needs to be set" if template.blank?
return errors.add :template, "needs to be a Hash" unless parsed_template.is_a?(Hash)
return errors.add :template, "needs metadata.labels.team" unless parsed_template.dig("metadata", "labels", "team")
errors.add :template, "needs metadata.labels.team" unless parsed_template.dig("metadata", "labels", "team")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh the symmetry 😞

Copy link
Contributor

@grosser grosser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, thx!

@grosser grosser merged commit 81eea0f into zendesk:master Jan 11, 2025
9 checks passed
@orien orien deleted the dependency-update branch January 11, 2025 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants