Merge branch '345105-prohibit-namespace-nil-type' into 'master'

Change default Namespace type from nil to User

See merge request gitlab-org/gitlab!74592

db/post_migrate/20211116091751_change_namespace_type_default_to_user.rb

+# frozen_string_literal: true
+
+class ChangeNamespaceTypeDefaultToUser < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      change_column_default :namespaces, :type, 'User'
+    end
+  end
+
+  def down
+    with_lock_retries do
+      change_column_default :namespaces, :type, nil
+    end
+  end
+end

db/schema_migrations/20211116091751

+d71889bba2150265e9482be0b5ee89f43168d4a35b47469a36873d65f00df878
\ No newline at end of file

db/structure.sql

@@ -16355,7 +16355,7 @@ CREATE TABLE namespaces (
     owner_id integer,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    type character varying,
+    type character varying DEFAULT 'User'::character varying,
     description character varying DEFAULT ''::character varying NOT NULL,
     avatar character varying,
     membership_lock boolean DEFAULT false,

ee/spec/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe ::Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchCol
   let(:scanners) { table(:vulnerability_scanners) }
   let(:vulnerability_identifiers) { table(:vulnerability_identifiers) }
 
-  let(:namespace) { namespaces.create!(name: "foo", path: "bar") }
+  let(:namespace) { namespaces.create!(name: "foo", path: "bar", type: "Group") }
 
   describe '#perform' do
     let!(:project_1) { projects.create!(namespace_id: namespace.id) }

ee/spec/services/ci/minutes/refresh_cached_data_service_spec.rb

@@ -4,8 +4,10 @@ require 'spec_helper'
 RSpec.describe Ci::Minutes::RefreshCachedDataService do
   include AfterNextHelpers
 
-  let_it_be(:project_1) { create(:project) }
-  let_it_be(:root_namespace) { project_1.root_namespace }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:subgroup) { create(:group, parent: group) }
+  let_it_be(:project_1) { create(:project, group: group) }
+  let_it_be(:root_namespace) { group }
   let_it_be(:build_1) { create(:ci_build, :pending, project: project_1) }
   let_it_be(:build_2) { create(:ci_build, :pending) }
   let_it_be(:pending_build_1) { create(:ci_pending_build, build: build_1, project: build_1.project, minutes_exceeded: true) }

spec/migrations/20211116091751_change_namespace_type_default_to_user_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_migration!
+
+RSpec.describe ChangeNamespaceTypeDefaultToUser do
+  let(:namespaces) { table(:namespaces) }
+
+  it 'defaults type to User' do
+    some_namespace1 = namespaces.create!(name: 'magic namespace1', path: 'magicnamespace1', type: nil)
+
+    expect(some_namespace1.reload.type).to be_nil
+
+    migrate!
+
+    some_namespace2 = namespaces.create!(name: 'magic namespace2', path: 'magicnamespace2', type: nil)
+
+    expect(some_namespace1.reload.type).to be_nil
+    expect(some_namespace2.reload.type).to eq 'User'
+  end
+end

spec/models/concerns/case_sensitivity_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe CaseSensitivity do
       Class.new(ActiveRecord::Base) do
         include CaseSensitivity
         self.table_name = 'namespaces'
+        self.inheritance_column = :_type_disabled
       end
     end