diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-07-13 13:32:14 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-07-13 13:32:14 +0200 |
| commit | 057d45fb23fdbc44636ffd9f352d66cef76c4d6a (patch) | |
| tree | be3b249cff36dd4c45b7735b08f922e08653cbb7 | |
| parent | 31565d78906577bf8582982e5492166e8edd3218 (diff) | |
| download | gitlab-ce-use_password_field_defaults_for_services.tar.gz | |
Use password field default password masking.use_password_field_defaults_for_services
| -rw-r--r-- | app/helpers/projects_helper.rb | 10 | ||||
| -rw-r--r-- | app/views/shared/_field.html.haml | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index aa15398cbed..78f24dbd7ef 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -248,16 +248,6 @@ module ProjectsHelper end end - def service_field_value(type, value) - return value unless type == 'password' - - if value.present? - "***********" - else - nil - end - end - def user_max_access_in_project(user, project) level = project.team.max_member_access(user) diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml index 30d37dceb30..45ec49280d2 100644 --- a/app/views/shared/_field.html.haml +++ b/app/views/shared/_field.html.haml @@ -1,6 +1,6 @@ - name = field[:name] - title = field[:title] || name.humanize -- value = service_field_value(field[:type], @service.send(name)) +- value = @service.send(name) - type = field[:type] - placeholder = field[:placeholder] - choices = field[:choices] @@ -19,6 +19,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, placeholder: value, class: 'form-control' + = form.password_field name, value: value, class: 'form-control' - if help %span.help-block= help |