From 587502390b3afa423a10f98f7568a26352cb0976 Mon Sep 17 00:00:00 2001 From: Marvin Frick Date: Fri, 9 May 2014 14:26:19 +0200 Subject: [PATCH] fixes gitlab.com issue #229 --- app/assets/javascripts/project_users_select.js.coffee | 2 +- app/assets/javascripts/users_select.js.coffee | 2 +- app/helpers/application_helper.rb | 2 +- spec/helpers/application_helper_spec.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/project_users_select.js.coffee b/app/assets/javascripts/project_users_select.js.coffee index a7fec96..382f9b3 100644 --- a/app/assets/javascripts/project_users_select.js.coffee +++ b/app/assets/javascripts/project_users_select.js.coffee @@ -43,7 +43,7 @@ avatar = avatar.replace('%{hash}', md5(user.email)) avatar = avatar.replace('%{size}', '24') else - avatar = gon.relative_url_root + "/assets/no_avatar.png" + avatar = gon.relative_url_root + "#{image_path('no_avatar.png')}" if user.id == '' avatarMarkup = '' diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index cab9f62..da66a4b 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -7,7 +7,7 @@ $ -> avatar = avatar.replace('%{hash}', md5(user.email)) avatar = avatar.replace('%{size}', '24') else - avatar = gon.relative_url_root + "/assets/no_avatar.png" + avatar = gon.relative_url_root + "#{image_path('no_avatar.png')}" "
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 198ca76..3201070 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -71,7 +71,7 @@ module ApplicationHelper size = 40 if size.nil? || size <= 0 if !Gitlab.config.gravatar.enabled || user_email.blank? - '/assets/no_avatar.png' + image_path('no_avatar.png') else gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url user_email.strip! diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 10c5617..6401ec0 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -79,11 +79,11 @@ describe ApplicationHelper do it "should return a generic avatar path when Gravatar is disabled" do Gitlab.config.gravatar.stub(:enabled).and_return(false) - gravatar_icon(user_email).should == '/assets/no_avatar.png' + gravatar_icon(user_email).should match('no_avatar.png') end it "should return a generic avatar path when email is blank" do - gravatar_icon('').should == '/assets/no_avatar.png' + gravatar_icon('').should match('no_avatar.png') end it "should return default gravatar url" do -- libgit2 0.21.2