summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorJan-Gerd Tenberge <janten@gmail.com>2015-09-26 21:51:02 +0200
committerJan-Gerd Tenberge <janten@gmail.com>2015-09-26 21:51:02 +0200
commit8d620e39c967739f99bd175449864524f05b915c (patch)
treecf499d8316c30895af7de0b64ee4eff2f1acffab /app/models/user.rb
parentf93177c6a3bee4c02f6a9a18278db13dd1c30c35 (diff)
downloadgitlab-ce-8d620e39c967739f99bd175449864524f05b915c.tar.gz
Add scale argument in user class
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb4
1 files changed, 2 insertions, 2 deletions
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