Commit f7365ae3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-issue-2555' into 'master'

Fix default avatars to ensure that helpers don't have /assets dir appended

See issue #2555

See merge request !1314
parents 09bcce7d 1dc04bf6
...@@ -82,7 +82,7 @@ module ApplicationHelper ...@@ -82,7 +82,7 @@ module ApplicationHelper
end end
def default_avatar def default_avatar
image_path('no_avatar.png') 'no_avatar.png'
end end
def last_commit(project) def last_commit(project)
......
...@@ -40,7 +40,7 @@ module AuthHelper ...@@ -40,7 +40,7 @@ module AuthHelper
if provider_has_icon?(provider) if provider_has_icon?(provider)
file_name = "#{provider.to_s.split('_').first}_#{size}.png" file_name = "#{provider.to_s.split('_').first}_#{size}.png"
image_tag(image_path("auth_buttons/#{file_name}"), alt: label, title: "Sign in with #{label}") image_tag("auth_buttons/#{file_name}", alt: label, title: "Sign in with #{label}")
else else
label label
end end
......
...@@ -27,7 +27,7 @@ module GroupsHelper ...@@ -27,7 +27,7 @@ module GroupsHelper
if group && group.avatar.present? if group && group.avatar.present?
group.avatar.url group.avatar.url
else else
image_path('no_group_avatar.png') 'no_group_avatar.png'
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment