Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/puma-5.6.8
Browse files Browse the repository at this point in the history
  • Loading branch information
heatherathebyne authored Mar 21, 2024
2 parents 99be9e3 + 09bc632 commit f856a6e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ GEM
net-smtp (0.4.0)
net-protocol
nio4r (2.7.0)
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)
Expand Down
2 changes: 1 addition & 1 deletion app/views/projects/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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' %>
<span class='fw-normal btn btn-outline-primary mb-1'><%= yarn_title %></span>
<% end %>
<% end %>
<% if @project.user == current_user %>
Expand Down

0 comments on commit f856a6e

Please sign in to comment.