diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-22 07:49:58 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-22 07:49:58 +0000 |
| commit | 6233e56e99b63e2fe1787753967833245ff932aa (patch) | |
| tree | 20a593fb0a51078ad769a4bddad0c6579173ea97 | |
| parent | 2079253f4d9099d3cab0e4451875b28c6665e4b2 (diff) | |
| parent | d0a25eb044942a078c28b96b43d2fc7e92dcc782 (diff) | |
| download | gitlab-ce-6233e56e99b63e2fe1787753967833245ff932aa.tar.gz | |
Merge branch '31510-mask-password-field-edit' into 'master'
Show password field mask while editing service settings
Closes #31510
See merge request !11431
| -rw-r--r-- | app/views/shared/_field.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/31510-mask-password-field-edit.yml | 4 | ||||
| -rw-r--r-- | features/steps/project/services.rb | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml index 8d6e16f74c3..d74b0043949 100644 --- a/app/views/shared/_field.html.haml +++ b/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 diff --git a/changelogs/unreleased/31510-mask-password-field-edit.yml b/changelogs/unreleased/31510-mask-password-field-edit.yml new file mode 100644 index 00000000000..0ef37be328d --- /dev/null +++ b/changelogs/unreleased/31510-mask-password-field-edit.yml @@ -0,0 +1,4 @@ +--- +title: Update password field label while editing service settings +merge_request: 11431 +author: diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb index 772b07d0ad8..3c0d987e403 100644 --- a/features/steps/project/services.rb +++ b/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 |