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
This commit is contained in:
Dmitriy Zaporozhets
2015-09-16 18:40:18 +00:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -82,7 +82,7 @@ module ApplicationHelper
end
def default_avatar
image_path('no_avatar.png')
'no_avatar.png'
end
def last_commit(project)
+1 -1
View File
@@ -40,7 +40,7 @@ module AuthHelper
if provider_has_icon?(provider)
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
label
end
+1 -1
View File
@@ -27,7 +27,7 @@ module GroupsHelper
if group && group.avatar.present?
group.avatar.url
else
image_path('no_group_avatar.png')
'no_group_avatar.png'
end
end