summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-03-12 22:27:46 +0000
committerMarin Jankovski <marin@gitlab.com>2015-03-12 22:27:46 +0000
commit1c3997a7472bbbde1aebc0c952651f19f52cdd18 (patch)
tree3ab5b5ea1db57f0a74ff0d8d455f9f59dd177d0b /app/helpers
parentcca08e146df037e2ffa88fde91ff102248efe6f6 (diff)
parenta1f5ae98e2afde84b028d17b489d7461f64a03d9 (diff)
downloadgitlab-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
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/projects_helper.rb10
1 files changed, 10 insertions, 0 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