Merge branch 'ee-mk-fix-issue-1843' into 'master'

Port of mk-fix-issue-1843 to EE

See merge request !1925

app/models/namespace.rb

@@ -47,7 +47,7 @@ class Namespace < ActiveRecord::Base
   before_destroy(prepend: true) { prepare_for_destroy }
   after_destroy :rm_dir
 
-  scope :root, -> { where('type IS NULL') }
+  scope :for_user, -> { where('type IS NULL') }
 
   scope :with_statistics, -> do
     joins('LEFT JOIN project_statistics ps ON ps.namespace_id = namespaces.id')

app/models/user.rb

@@ -371,7 +371,7 @@ class User < ActiveRecord::Base
     end
 
     def find_by_full_path(path, follow_redirects: false)
-      namespace = Namespace.find_by_full_path(path, follow_redirects: follow_redirects)
+      namespace = Namespace.for_user.find_by_full_path(path, follow_redirects: follow_redirects)
       namespace&.owner
     end
 

spec/models/user_spec.rb

@@ -953,6 +953,15 @@ describe User, models: true do
     end
 
     context 'with a group route matching the given path' do
+      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
+          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
@@ -960,6 +969,7 @@ describe User, models: true do
         end
       end
     end
+  end
 
   describe 'all_ssh_keys' do
     it { is_expected.to have_many(:keys).dependent(:destroy) }