diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 05:52:01 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 05:52:01 -0800 |
| commit | c2ba868c9b92a90e53972b5e357c39df2606699c (patch) | |
| tree | 00561fd7deebb0191a4cbf4d8c52f87664226f35 | |
| parent | f22488f7262145c1e318db15c0af2091e67d5007 (diff) | |
| parent | 157b03866124d562b78583fbcb38b3db8ac84d4e (diff) | |
| download | gitlab-ce-c2ba868c9b92a90e53972b5e357c39df2606699c.tar.gz | |
Merge pull request #2954 from cabeca/fix-image-url-emoji
Fix image url for emoji.
| -rw-r--r-- | app/helpers/application_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dad23471a90..955dbc17254 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -164,7 +164,8 @@ module ApplicationHelper end def image_url(source) - root_url + 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 |