From 71cdb24990beb0d6f0d3d845d01e75b14180801b Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 16 Sep 2015 10:52:23 -0700 Subject: [PATCH 1/2] Fix default avatars to ensure that helpers don't have /assets dir appended --- app/helpers/application_helper.rb | 2 +- app/helpers/groups_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c3da54fd55..b049bd9fcc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -82,7 +82,7 @@ module ApplicationHelper end def default_avatar - image_path('no_avatar.png') + 'no_avatar.png' end def last_commit(project) diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 82eebf4245..5e70de23f2 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -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 From 1dc04bf6b7b3d3984e1ba69c7fce5f7fa1677fe9 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 16 Sep 2015 11:04:09 -0700 Subject: [PATCH 2/2] Eliminate combined image_tag and image_path in providers list --- app/helpers/auth_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index d9502181c4..ce7e9b1db8 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -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