diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:11 +0000 |
| commit | 8a7efa45c38ed3200d173d2c3207a8154e583c16 (patch) | |
| tree | 1bb4d579b95c79aae4946a06fefa089e5549b722 /app/models/user.rb | |
| parent | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (diff) | |
| download | gitlab-ce-8a7efa45c38ed3200d173d2c3207a8154e583c16.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index e18d642a155..4d450f9305f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1689,7 +1689,7 @@ class User < ApplicationRecord def gitlab_employee? strong_memoize(:gitlab_employee) do if Gitlab.com? - Mail::Address.new(email).domain == "gitlab.com" + Mail::Address.new(email).domain == "gitlab.com" && confirmed? else false end |