Merge branch '31510-mask-password-field-edit' into 'master'

Show password field mask while editing service settings

Closes #31510

See merge request !11431

app/views/shared/_field.html.haml

@@ -9,7 +9,7 @@
 
 .form-group
   - if type == "password" && value.present?
-    = form.label name, "Change #{title}", class: "control-label"
+    = form.label name, "Enter new #{title.downcase}", class: "control-label"
   - else
     = form.label name, title, class: "control-label"
   .col-sm-10
@@ -22,6 +22,6 @@
     - elsif type == 'select'
       = form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
     - elsif type == 'password'
-      = form.password_field name, autocomplete: "new-password", class: 'form-control'
+      = form.password_field name, autocomplete: "new-password", class: "form-control"
     - if help
       %span.help-block= help

changelogs/unreleased/31510-mask-password-field-edit.yml

+---
+title: Update password field label while editing service settings
+merge_request: 11431
+author:

features/steps/project/services.rb

@@ -211,7 +211,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
   end
 
   step 'I should see empty field Change Password' do
-    expect(find_field('Change Password').value).to be_nil
+    expect(find_field('Enter new password').value).to be_nil
   end
 
   step 'I click JetBrains TeamCity CI service link' do