From 8600e7ec8e30b3cb0e82f34ed858e23d024937c5 Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sun, 8 Dec 2024 23:39:16 +0000
Subject: Merge r23360 from trunk to 5.1-stable (#41927).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23367 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/account/twofa_confirm.html.erb  | 2 +-
 app/views/twofa/_twofa_code_form.html.erb | 2 +-
 app/views/twofa/activate_confirm.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/account/twofa_confirm.html.erb b/app/views/account/twofa_confirm.html.erb
index 5cf3b3dda..aaf6d3ecb 100644
--- a/app/views/account/twofa_confirm.html.erb
+++ b/app/views/account/twofa_confirm.html.erb
@@ -12,7 +12,7 @@
       <%=l 'twofa_label_code' -%>
       <%= link_to l('twofa_resend_code'), { controller: 'account', action: 'twofa_resend' }, method: :post, class: 'lost_password' if @twofa_view[:resendable] -%>
     </label>
-    <%= text_field_tag :twofa_code, nil, tabindex: '1', autocomplete: 'off', autofocus: true -%>
+    <%= text_field_tag :twofa_code, nil, tabindex: '1', autocomplete: 'one-time-code', autofocus: true -%>
 
     <%= submit_tag l(:button_login), tabindex: '2', id: 'login-submit', name: :submit_otp -%>
   <% end %>
diff --git a/app/views/twofa/_twofa_code_form.html.erb b/app/views/twofa/_twofa_code_form.html.erb
index b9d0e1bf7..5ba01dfbf 100644
--- a/app/views/twofa/_twofa_code_form.html.erb
+++ b/app/views/twofa/_twofa_code_form.html.erb
@@ -3,7 +3,7 @@
   <div class="tabular">
     <p>
       <label for="twofa_code"><%=l 'twofa_label_code' -%></label>
-      <%= text_field_tag :twofa_code, nil, autocomplete: 'off' -%>
+      <%= text_field_tag :twofa_code, nil, autocomplete: 'one-time-code' -%>
     </p>
   </div>
 </div>
diff --git a/app/views/twofa/activate_confirm.html.erb b/app/views/twofa/activate_confirm.html.erb
index 78194c62b..6a9bb070e 100644
--- a/app/views/twofa/activate_confirm.html.erb
+++ b/app/views/twofa/activate_confirm.html.erb
@@ -12,7 +12,7 @@
         <%= render partial: "twofa/#{@twofa_view[:scheme_name]}/new", locals: { twofa_view: @twofa_view } -%>
         <p>
           <label for="twofa_code"><%=l 'twofa_label_code' -%></label>
-          <%= text_field_tag :twofa_code, nil, autocomplete: 'off', autofocus: true -%>
+          <%= text_field_tag :twofa_code, nil, autocomplete: 'one-time-code', autofocus: true -%>
         </p>
       </div>
     </div>
-- 
cgit v1.2.3