diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-29 11:49:14 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-29 11:49:14 -0700 |
| commit | fe86c8dfbd81ef21d0d685105397f4bf6048b2f2 (patch) | |
| tree | 106ff615898f09076cada653a8dfb5710ce593db /app/models/user.rb | |
| parent | d92f428024b2878682bb23b6b03bc671636b5afe (diff) | |
| parent | a429eb4d455cabde26c5cdf8a3b38e65966531dc (diff) | |
| download | gitlab-ce-fe86c8dfbd81ef21d0d685105397f4bf6048b2f2.tar.gz | |
Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1f0735a7e7b..48e0e6ed48b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -637,10 +637,6 @@ class User < ActiveRecord::Base email.start_with?('temp-email-for-oauth') end - def public_profile? - authorized_projects.public_only.any? - end - def avatar_url(size = nil) if avatar.present? [gitlab_config.url, avatar.url].join |