Merge branch 'main' into Surface-invalid-logs

6 months ago · 7f6fcde396
2 changed files with 4 additions and 4 deletions
--- a/app/helpers/tasklist_helper.rb
+++ b/app/helpers/tasklist_helper.rb
@ -7,7 +7,7 @@ module TasklistHelper
  def breadcrumb_logs_title(log, current_user)
    log_type = log.lettings? ? "Lettings" : "Sales"
    if current_user.support? && breadcrumb_organisation(log).present?
-      "#{log_type} logs (#{breadcrumb_organisation(log).name})"
+      "#{log_type} logs (#{breadcrumb_organisation(log).name(date: log.startdate)})"
    else
      "#{log_type} logs"
    end
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@ -210,11 +210,11 @@ GEM
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
    minitest (5.19.0)
-    nokogiri (1.18.4-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.4-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
      racc (~> 1.4)
    octokit (4.25.1)
      faraday (>= 1, < 3)