Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 7 deletions

diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index f76e9f3f6ed..f25ee8dedfb 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -17,9 +17,9 @@
     .col-sm-4
       = text_field_tag :gitea_host_url, nil, placeholder: 'https://gitea.com', class: 'form-control gl-form-input'
   .form-group.row
-    = label_tag :personal_access_token, _('Personal access token'), class: 'col-form-label col-sm-2'
+    = label_tag :personal_access_token, _('Personal access token'), for: :personal_access_token, class: 'col-form-label col-sm-2'
     .col-sm-4
-      = text_field_tag :personal_access_token, nil, class: 'form-control gl-form-input'
+      = password_field_tag :personal_access_token, nil, class: 'form-control gl-form-input'
   .form-actions
     = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do
       = _('List your Gitea repositories')
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml
index 5293013b813..6d0205957ec 100644
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -23,9 +23,9 @@
 
 = form_tag personal_access_token_import_github_path, method: :post do
   .form-group
-    %label.label-bold= _('Personal Access Token')
+    %label.col-form-label{ for: 'personal_access_token' }= _('Personal Access Token')
     = hidden_field_tag(:namespace_id, params[:namespace_id])
-    = text_field_tag :personal_access_token, '', class: 'form-control gl-form-input', placeholder: _('e.g. %{token}') % { token: '8d3f016698e...' }, data: { qa_selector: 'personal_access_token_field' }
+    = password_field_tag :personal_access_token, '', class: 'form-control gl-form-input', placeholder: _('e.g. %{token}') % { token: '8d3f016698e...' }, data: { testid: 'personal_access_token_field' }
     %span.form-text.gl-text-gray-600
       = import_github_personal_access_token_message
 
@@ -34,7 +34,5 @@
   .form-actions.gl-display-flex.gl-justify-content-end
     = render Pajamas::ButtonComponent.new(href: new_project_path) do
       = _('Cancel')
-    = render Pajamas::ButtonComponent.new(variant: :confirm,
-      type: :submit,
-      button_options: { class: 'gl-ml-3', data: { qa_selector: 'authenticate_button' } }) do
+    = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-ml-3', data: { testid: 'authenticate_button' } }) do
       = _('Authenticate')