From 64ad6cc4c59a100192b4b553ce25b984e76f1f5a Mon Sep 17 00:00:00 2001 From: Heather Athebyne Date: Tue, 23 Jan 2024 14:43:05 -0500 Subject: [PATCH 1/2] Fix issue with showing project which has a stash usage with no YarnProduct For example, handmade yarns --- app/views/projects/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 144ea6a..8d71bc8 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -52,7 +52,7 @@ <% if user_signed_in? && @project.user == current_user %> <%= link_to yarn_title, usage.stash_yarn, class: 'fw-normal btn btn-outline-primary mb-1' %> <% else %> - <%= link_to yarn_title, yarn_product_path(usage.stash_yarn.yarn_product_id), class: 'fw-normal btn btn-outline-primary mb-1' %> + <%= yarn_title %> <% end %> <% end %> <% if @project.user == current_user %> From 6d30506d172f55a4a3d1b343fb09b9eb39b67339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 03:48:01 +0000 Subject: [PATCH 2/2] Bump nokogiri from 1.15.5 to 1.16.2 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.5 to 1.16.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.5...v1.16.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c3e388f..53270c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,10 +206,10 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.6.1) - nokogiri (1.15.5) + nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) popper_js (2.11.5)