summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorMiguel Cabeça <cabeca@ist.utl.pt>2013-02-17 13:02:22 +0000
committerMiguel Cabeça <cabeca@ist.utl.pt>2013-02-17 13:02:22 +0000
commit157b03866124d562b78583fbcb38b3db8ac84d4e (patch)
tree0b856b2bca298efeabc2ce36b34b8a7247a78fdb /app/helpers/application_helper.rb
parentf6957f76586a5bba510f29a7ed965a606945c868 (diff)
downloadgitlab-ce-157b03866124d562b78583fbcb38b3db8ac84d4e.tar.gz
Include Riyad Preukschas suggestions.
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f5ad8330c68..f640d5647ff 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -160,7 +160,8 @@ module ApplicationHelper
end
def image_url(source)
- root_url.sub(/#{root_path}$/,'') + path_to_image(source)
+ # prevent relative_root_path being added twice (it's part of root_url and path_to_image)
+ root_url.sub(/#{root_path}$/, path_to_image(source))
end
alias_method :url_to_image, :image_url
end