diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-03-12 22:27:46 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-03-12 22:27:46 +0000 |
| commit | 1c3997a7472bbbde1aebc0c952651f19f52cdd18 (patch) | |
| tree | 3ab5b5ea1db57f0a74ff0d8d455f9f59dd177d0b | |
| parent | cca08e146df037e2ffa88fde91ff102248efe6f6 (diff) | |
| parent | a1f5ae98e2afde84b028d17b489d7461f64a03d9 (diff) | |
| download | gitlab-ce-1c3997a7472bbbde1aebc0c952651f19f52cdd18.tar.gz | |
Merge branch 'replace_passwords_with_asterisk' into 'master'
Show asterisks instead of password in service edit form.
See merge request !1686
| -rw-r--r-- | app/helpers/projects_helper.rb | 10 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a5d7372bbe5..2225b110651 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -265,4 +265,14 @@ module ProjectsHelper "success" end end + + def service_field_value(type, value) + return value unless type == 'password' + + if value.present? + "***********" + else + nil + end + end end diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index eda59e6708b..3492dd5babd 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -75,7 +75,7 @@ - @service.fields.each do |field| - name = field[:name] - title = field[:title] || name.humanize - - value = @service.send(name) unless field[:type] == 'password' + - value = service_field_value(field[:type], @service.send(name)) - type = field[:type] - placeholder = field[:placeholder] - choices = field[:choices] @@ -94,7 +94,7 @@ - elsif type == 'select' = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" } - elsif type == 'password' - = f.password_field name, class: 'form-control' + = f.password_field name, placeholder: value, class: 'form-control' - if help %span.help-block= help |