From a01aec43667f89b7f0cded43c68e6dc4b0a3c1bd Mon Sep 17 00:00:00 2001 From: Fabian Plettner Date: Fri, 1 Feb 2013 12:12:47 +0100 Subject: [PATCH] Checks if return value is a string or not, before rendering. fixes #2014 --- app/helpers/tree_helper.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index 0f2b695e0ad..6705f19cac9 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -15,7 +15,10 @@ module TreeHelper files.each do |f| if f.respond_to?(:url) # Object is a Submodule - tree += render partial: 'tree/submodule_item', object: f + rendering = render partial: 'tree/submodule_item', object: f + if rendering.is_a? String + tree += rendering + end else # Object is a Blob tree += render partial: 'tree/tree_item', object: f, locals: {type: 'file'} -- GitLab