summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-11-14 11:08:58 +0100
committerMarin Jankovski <maxlazio@gmail.com>2014-11-14 11:08:58 +0100
commitced2438312c3fd48f9487465533bb493d83ee998 (patch)
treec3c109484e17ed90e73bb912e46aa4a703f9b812
parent4e65d085b50844469a322d46773de04c16159ce1 (diff)
downloadgitlab-ce-ced2438312c3fd48f9487465533bb493d83ee998.tar.gz
Clean the string with commit author and email.
-rw-r--r--app/helpers/commits_helper.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 0e0532b65b2..36adeadd8a5 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -87,8 +87,8 @@ module CommitsHelper
# avatar: true will prepend the avatar image
# size: size of the avatar image in px
def commit_person_link(commit, options = {})
- source_name = commit.send "#{options[:source]}_name".to_sym
- source_email = commit.send "#{options[:source]}_email".to_sym
+ source_name = clean(commit.send "#{options[:source]}_name".to_sym)
+ source_email = clean(commit.send "#{options[:source]}_email".to_sym)
user = User.find_for_commit(source_email, source_name)
person_name = user.nil? ? source_name : user.name
@@ -124,4 +124,8 @@ module CommitsHelper
def truncate_sha(sha)
Commit.truncate_sha(sha)
end
+
+ def clean(string)
+ Sanitize.clean(string, remove_contents: true)
+ end
end