Skip to content
Snippets Groups Projects
Commit f7365ae3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -82,7 +82,7 @@ module ApplicationHelper
end
 
def default_avatar
image_path('no_avatar.png')
'no_avatar.png'
end
 
def last_commit(project)
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment