From c6cdf7772e9c00f0ddf0df8f249e0d33c035f6b0 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 11 Sep 2025 03:31:16 +0000 Subject: [PATCH] Merged r23936 from trunk to 5.1-stable (#43175). git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23967 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/imports/_users_saved_objects.html.erb | 2 +- app/views/issue_categories/destroy.html.erb | 3 ++- app/views/mail_handler/new.html.erb | 2 +- app/views/projects/show.html.erb | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/imports/_users_saved_objects.html.erb b/app/views/imports/_users_saved_objects.html.erb index 5e11a9289..efcf7b971 100644 --- a/app/views/imports/_users_saved_objects.html.erb +++ b/app/views/imports/_users_saved_objects.html.erb @@ -17,7 +17,7 @@ <%= user.lastname %> <%= mail_to(user.mail) %> <%= checked_image user.admin? %> - <%= l(("status_#{User::LABEL_BY_STATUS[user.status]}")) %> + <%= l(("status_#{User::LABEL_BY_STATUS[user.status]}")) %> <% end %> diff --git a/app/views/issue_categories/destroy.html.erb b/app/views/issue_categories/destroy.html.erb index 5f13eedcf..bb5ab7b13 100644 --- a/app/views/issue_categories/destroy.html.erb +++ b/app/views/issue_categories/destroy.html.erb @@ -7,8 +7,9 @@ <% if @categories.size > 0 %> : <%= label_tag "reassign_to_id", l(:description_issue_category_reassign), :class => "hidden-for-sighted" %> -<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %>

+<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %> <% end %> +

<%= submit_tag l(:button_apply) %> diff --git a/app/views/mail_handler/new.html.erb b/app/views/mail_handler/new.html.erb index 25cf05bae..d371cef40 100644 --- a/app/views/mail_handler/new.html.erb +++ b/app/views/mail_handler/new.html.erb @@ -14,7 +14,7 @@
Raw Email - <%= text_area_tag 'email', '', :style => 'width:95%; height:400px;' %> +
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index a1035927f..688fba5a9 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -102,10 +102,10 @@

<%= l(:label_time_tracking) %>