summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-07 15:17:43 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-07 15:22:28 +0200
commit12626f029dc4ab345f8afa1fd42a3c04723ec55e (patch)
tree3db63157c1de056cc75b4efa756827e4dceac8a0
parent4f629dab2a14c190b641bd709c28ebdad5b7a062 (diff)
downloadgitlab-ce-12626f029dc4ab345f8afa1fd42a3c04723ec55e.tar.gz
Return strings where expected
-rw-r--r--app/helpers/gitlab_markdown_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 40161c5a641..6264b7f82ef 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -45,7 +45,7 @@ module GitlabMarkdownHelper
end
def markdown(text, context = {})
- return unless text.present?
+ return "" unless text.present?
context.reverse_merge!(
path: @path,
@@ -62,7 +62,7 @@ module GitlabMarkdownHelper
# TODO (rspeicher): Remove all usages of this helper and just call `markdown`
# with a custom pipeline depending on the content being rendered
def gfm(text, options = {})
- return unless text.present?
+ return "" unless text.present?
options.reverse_merge!(
path: @path,