From 8d620e39c967739f99bd175449864524f05b915c Mon Sep 17 00:00:00 2001
From: Jan-Gerd Tenberge <janten@gmail.com>
Date: Sat, 26 Sep 2015 21:51:02 +0200
Subject: [PATCH] Add scale argument in user class
---
app/helpers/application_helper.rb | 4 ++--
app/models/user.rb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 162dae1ed32..056ffd278f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -68,13 +68,13 @@ module ApplicationHelper
end
end
- def avatar_icon(user_email = '', size = nil)
+ def avatar_icon(user_email = '', size = nil, scale = 2)
user = User.find_by(email: user_email)
if user
user.avatar_url(size) || default_avatar
else
- gravatar_icon(user_email, size)
+ gravatar_icon(user_email, size, scale)
end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 25371f9138a..55c095d7d57 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -633,11 +633,11 @@ class User < ActiveRecord::Base
email.start_with?('temp-email-for-oauth')
end
- def avatar_url(size = nil)
+ def avatar_url(size = nil, scale = 2)
if avatar.present?
[gitlab_config.url, avatar.url].join
else
- GravatarService.new.execute(email, size)
+ GravatarService.new.execute(email, size, scale)
end
end
--
GitLab