From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Jul 2022 16:02:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3597'
X-Git-Tag: live~2346
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/57f8fe38593330010693a4f42c66055b5d610572?hp=3eb5b7cfeb6e6e5fe1f0ea84f34bd363cc4fb1cb

Merge remote-tracking branch 'upstream/pull/3597'
---

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 7365295bd..09fe9c510 100644
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -6,7 +6,7 @@
 
 <%= bootstrap_form_for @trace do |f| %>
   <%= f.text_field :name, :disabled => true %>
-  <%= f.text_field :description %>
+  <%= f.text_field :description, :maxlength => 255 %>
   <%= f.text_field :tagstring %>
   <%= f.select :visibility,
                [[t("traces.visibility.private"), "private"],
diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index b7951cb32..bff8cd3bc 100644
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -4,7 +4,7 @@
 
 <%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %>
-  <%= f.text_field :description %>
+  <%= f.text_field :description, :maxlength => 255 %>
   <%= f.text_field :tagstring %>
   <%= f.select :visibility,
                [[t("traces.visibility.private"), "private"],