Commit 8d4cc9cb authored by Michael Kozono's avatar Michael Kozono

Fixes #32474

Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
parent 0b946a7b
...@@ -351,7 +351,9 @@ class User < ActiveRecord::Base ...@@ -351,7 +351,9 @@ class User < ActiveRecord::Base
def find_by_full_path(path, follow_redirects: false) def find_by_full_path(path, follow_redirects: false)
namespace = Namespace.find_by_full_path(path, follow_redirects: follow_redirects) namespace = Namespace.find_by_full_path(path, follow_redirects: follow_redirects)
namespace&.owner return unless namespace && namespace.kind == 'user'
namespace.owner
end end
def reference_prefix def reference_prefix
......
...@@ -929,10 +929,20 @@ describe User, models: true do ...@@ -929,10 +929,20 @@ describe User, models: true do
end end
context 'with a group route matching the given path' do context 'with a group route matching the given path' do
let!(:group) { create(:group, path: 'group_path') } context 'when the group namespace has an owner_id (legacy data)' do
let!(:group) { create(:group, path: 'group_path', owner: user) }
it 'returns nil' do it 'returns nil' do
expect(User.find_by_full_path('group_path')).to eq(nil) expect(User.find_by_full_path('group_path')).to eq(nil)
end
end
context 'when the group namespace does not have an owner_id' do
let!(:group) { create(:group, path: 'group_path') }
it 'returns nil' do
expect(User.find_by_full_path('group_path')).to eq(nil)
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment