From 5f91437ebbc288f9543784b5fab88434eca27064 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Wed, 5 Nov 2025 16:52:20 +0000 Subject: [PATCH 1/6] GitHub Actions gem installation fix for sass-embedded on ruby 3.1 --- ndr_error.gemspec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ndr_error.gemspec b/ndr_error.gemspec index ecc62c2..3eb4556 100644 --- a/ndr_error.gemspec +++ b/ndr_error.gemspec @@ -45,6 +45,13 @@ Gem::Specification.new do |s| # https://bugs.ruby-lang.org/issues/19371 s.add_development_dependency 'psych', '< 5' + # Workaround build issue on GitHub Actions with ruby <= 3.1 when installing sass-embedded + # Versions 1.77.0 and above require ruby >= 3.2 for packaged x86_64-linux binaries + # but say they're compatible with ruby 3.1. + # 1.76.0 has a bug that was fixed in 1.77.1, which we can't use yet. + # https://github.com/sass/dart-sass/issues/2239 + s.add_development_dependency 'sass-embedded', '~> 1.75.0' if RUBY_VERSION.start_with?('3.1') # rubocop:disable Gemspec/RubyVersionGlobalsUsage + s.add_development_dependency 'mocha' s.add_development_dependency 'test-unit', '~> 3.0' From 5b28b60c01aeb1ad51d09375e52b6adf12c454dc Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Wed, 5 Nov 2025 17:01:08 +0000 Subject: [PATCH 2/6] Fix ruby 3.4 frozen string literal warnings --- CHANGELOG.md | 1 + app/helpers/ndr_error/errors_helper.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4e35d4..f0668f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## [Unreleased] ### Fixed * Support Ruby 3.4, Rails 8.0 +* Fix ruby 3.4 frozen string literal warnings ## 2.4.2 / 2025-03-23 * fix link with icon button style diff --git a/app/helpers/ndr_error/errors_helper.rb b/app/helpers/ndr_error/errors_helper.rb index 79ded8a..0af01fa 100644 --- a/app/helpers/ndr_error/errors_helper.rb +++ b/app/helpers/ndr_error/errors_helper.rb @@ -11,7 +11,7 @@ def highlighted_trace_for(error) error.backtrace.map do |line| css_classes = 'trace-item' - css_classes << ' stack-only' unless highlighting.include?(line) + css_classes += ' stack-only' unless highlighting.include?(line) content_tag(:span, line, class: css_classes) end @@ -96,7 +96,7 @@ def previous_button_for(error) def next_button_for(error) css = 'btn btn-outline-secondary' - css << ' disabled' if error.nil? + css += ' disabled' if error.nil? text = bootstrap_icon_tag('chevron-right', :bi) path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error) From e7ccbf33391e42f9ed13acefb4727f2371a76be2 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Wed, 5 Nov 2025 17:10:58 +0000 Subject: [PATCH 3/6] Fix ruby 3.4 frozen string literal warnings --- app/helpers/ndr_error/errors_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/ndr_error/errors_helper.rb b/app/helpers/ndr_error/errors_helper.rb index 0af01fa..aad9433 100644 --- a/app/helpers/ndr_error/errors_helper.rb +++ b/app/helpers/ndr_error/errors_helper.rb @@ -59,7 +59,7 @@ def downstream_fingerprint_link(print) def ticket_link_for(fingerprint, small = false) # rubocop:disable Style/OptionalBooleanParameter text = bootstrap_icon_tag('asterisk', :bi) + ' View ticket' # rubocop:disable Style/StringConcatenation css = 'btn btn-outline-secondary' - css << ' btn-xs' if small + css += ' btn-xs' if small url = fingerprint.ticket_url link_to(text, /^http/i =~ url ? url : "http://#{url}", class: css) @@ -87,7 +87,7 @@ def purge_button_for(fingerprint) def previous_button_for(error) css = 'btn btn-outline-secondary' - css << ' disabled' if error.nil? + css += ' disabled' if error.nil? text = bootstrap_icon_tag('chevron-left', :bi) path = error.nil? ? '#' : error_fingerprint_path(error.error_fingerprint, log_id: error) From c1186cab5831f535ad32df04c3aecdbc5ef4ba94 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Wed, 5 Nov 2025 16:38:41 +0000 Subject: [PATCH 4/6] tag version v2.4.3 --- CHANGELOG.md | 3 +++ code_safety.yml | 22 +++++++++++++--------- lib/ndr_error/version.rb | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0668f7..dedb07e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ ## [Unreleased] +* no unreleased changes + +## 2.4.3 / 2025-11-05 ### Fixed * Support Ruby 3.4, Rails 8.0 * Fix ruby 3.4 frozen string literal warnings diff --git a/code_safety.yml b/code_safety.yml index 853f264..7621a70 100644 --- a/code_safety.yml +++ b/code_safety.yml @@ -7,11 +7,11 @@ file safety: ".github/workflows/lint.yml": comments: reviewed_by: brian.shand - safe_revision: c90243cf99541357a3bdfb913db7f40c5813dce9 + safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b ".github/workflows/test.yml": comments: reviewed_by: brian.shand - safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb + safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b ".gitignore": comments: reviewed_by: josh.pencheon @@ -27,7 +27,7 @@ file safety: CHANGELOG.md: comments: reviewed_by: brian.shand - safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb + safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b CODE_OF_CONDUCT.md: comments: reviewed_by: Miles Smith @@ -74,7 +74,7 @@ file safety: app/helpers/ndr_error/errors_helper.rb: comments: reviewed_by: brian.shand - safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb + safe_revision: f968e83350a73d8f2a8492d347227e5f14dd5c95 app/models/ndr_error/fingerprint.rb: comments: reviewed_by: brian.shand @@ -98,7 +98,7 @@ file safety: app/views/ndr_error/errors/show.html.erb: comments: reviewed_by: brian.shand - safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb + safe_revision: 0a16c83664ec45d09e939162a50ab3c7d0acbf85 config/routes.rb: comments: reviewed_by: josh.pencheon @@ -131,6 +131,10 @@ file safety: comments: reviewed_by: brian.shand safe_revision: 6c6c33cfa43cf89b18a122c131f1c01bceb1386f + gemfiles/Gemfile.rails80: + comments: + reviewed_by: brian.shand + safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b lib/ndr_error.rb: comments: Potentially dangerous defaults. Default configuration assumes any given user is both authenticated and authorized to read/update/delete any error. JMP @@ -176,7 +180,7 @@ file safety: lib/ndr_error/version.rb: comments: reviewed_by: brian.shand - safe_revision: c7df9078d94a3b4fe8850053e6782361d148d853 + safe_revision: 02eb1839eb802e086f253306571475d5361cf573 lib/tasks/ndr_error_tasks.rake: comments: reviewed_by: Miles Smith @@ -184,7 +188,7 @@ file safety: ndr_error.gemspec: comments: reviewed_by: brian.shand - safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb + safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b script/rails: comments: reviewed_by: Miles Smith @@ -355,8 +359,8 @@ file safety: safe_revision: aaf2bb6a41ebe0c8fed889b8410a66eb8d5a26eb test/unit/helpers/ndr_error/errors_helper_test.rb: comments: - reviewed_by: josh.pencheon - safe_revision: 0c8ae75d4cba713cc45dca3d94734fa77f170a82 + reviewed_by: brian.shand + safe_revision: 0a16c83664ec45d09e939162a50ab3c7d0acbf85 test/unit/ndr_error/finder_test.rb: comments: reviewed_by: josh.pencheon diff --git a/lib/ndr_error/version.rb b/lib/ndr_error/version.rb index 8407a3e..936d860 100644 --- a/lib/ndr_error/version.rb +++ b/lib/ndr_error/version.rb @@ -2,5 +2,5 @@ # Contains the version of NdrError. Sourced by the gemspec. module NdrError - VERSION = '2.4.2' + VERSION = '2.4.3' end From f4bb307e811d5def842c9631b192264e4e67e914 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Fri, 7 Nov 2025 09:55:59 +0000 Subject: [PATCH 5/6] code review --- code_safety.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code_safety.yml b/code_safety.yml index 7621a70..4bf3db9 100644 --- a/code_safety.yml +++ b/code_safety.yml @@ -74,7 +74,7 @@ file safety: app/helpers/ndr_error/errors_helper.rb: comments: reviewed_by: brian.shand - safe_revision: f968e83350a73d8f2a8492d347227e5f14dd5c95 + safe_revision: e7ccbf33391e42f9ed13acefb4727f2371a76be2 app/models/ndr_error/fingerprint.rb: comments: reviewed_by: brian.shand @@ -188,7 +188,7 @@ file safety: ndr_error.gemspec: comments: reviewed_by: brian.shand - safe_revision: 2944af4f7174ccc35b730544caaa97e9dc09c64b + safe_revision: 5f91437ebbc288f9543784b5fab88434eca27064 script/rails: comments: reviewed_by: Miles Smith From aba51b6795f9cda563fad9206e837008dd98f5e3 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Fri, 7 Nov 2025 09:56:38 +0000 Subject: [PATCH 6/6] tag version v2.4.3 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dedb07e..a04f598 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## [Unreleased] * no unreleased changes -## 2.4.3 / 2025-11-05 +## 2.4.3 / 2025-11-07 ### Fixed * Support Ruby 3.4, Rails 8.0 * Fix ruby 3.4 frozen string literal warnings