diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-05-17 17:01:19 -0700 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-05-17 17:12:09 -0700 |
commit | 8d4cc9cbe07d96ee34dd2559e34b38b712c3b3b4 (patch) | |
tree | 015d7e518cb71d37bd0a5098da96a37a5f3eaf48 /app/models/user.rb | |
parent | 0b946a7bc69058a952a558a9530cd3e8302361e7 (diff) | |
download | gitlab-ce-8d4cc9cbe07d96ee34dd2559e34b38b712c3b3b4.tar.gz |
Fixes #32474
Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 088a7cb83d5..7d71b0773e0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -351,7 +351,9 @@ class User < ActiveRecord::Base def find_by_full_path(path, follow_redirects: false) namespace = Namespace.find_by_full_path(path, follow_redirects: follow_redirects) - namespace&.owner + return unless namespace && namespace.kind == 'user' + + namespace.owner end def reference_prefix |