Merge branch '14770-ignore-deprecated-column-on-projects' into 'master'

Ignore deprecated column and remove references to it

Closes #14770

See merge request gitlab-org/gitlab!18911

app/models/project.rb

@@ -76,6 +76,10 @@ class Project < ApplicationRecord
 
   delegate :no_import?, to: :import_state, allow_nil: true
 
+  # TODO: remove once GitLab 12.5 is released
+  # https://gitlab.com/gitlab-org/gitlab/issues/34638
+  self.ignored_columns += %i[merge_requests_require_code_owner_approval]
+
   default_value_for :archived, false
   default_value_for :resolve_outdated_diff_discussions, false
   default_value_for :container_registry_enabled, gitlab_config_features.container_registry

changelogs/unreleased/14770-ignore-deprecated-column-on-projects.yml

+---
+title: Ignore deprecated column and remove references to it
+merge_request: 18911
+author:
+type: deprecated

ee/app/controllers/ee/projects_controller.rb

@@ -49,7 +49,6 @@ module EE
         merge_requests_author_approval
         merge_requests_disable_committers_approval
         require_password_to_approve
-        merge_requests_require_code_owner_approval
         group_with_project_templates_id
       ]
 

ee/spec/factories/projects.rb

@@ -62,10 +62,6 @@ FactoryBot.modify do
       last_repository_updated_at { rand(1.year).seconds.ago }
     end
 
-    trait :requiring_code_owner_approval do
-      merge_requests_require_code_owner_approval { true }
-    end
-
     trait :jira_dvcs_cloud do
       before(:create) do |project|
         create(:project_feature_usage, :dvcs_cloud, project: project)

ee/spec/features/merge_request/user_sees_approval_widget_spec.rb

@@ -110,8 +110,6 @@ describe 'Merge request > User sees approval widget', :js do
           before do
             stub_licensed_features(code_owner_approval_required: true, multiple_approval_rules: true)
 
-            project.update!(merge_requests_require_code_owner_approval: true)
-
             allow(ProtectedBranch)
               .to receive(:branch_requires_code_owner_approval?).and_return(true)
           end

ee/spec/fixtures/lib/gitlab/import_export/project.designs.json

@@ -34,7 +34,6 @@
    "pages_https_only":false,
    "external_webhook_token":null,
    "merge_requests_author_approval":null,
-   "merge_requests_require_code_owner_approval":null,
    "merge_requests_disable_committers_approval":null,
    "require_password_to_approve":null,
    "labels":[

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -80,7 +80,7 @@ describe Gitlab::UsageData do
       context 'for create' do
         it 'includes accurate usage_activity_by_stage data' do
           user = create(:user)
-          project = create(:project, :repository_private, :requiring_code_owner_approval, :github_imported,
+          project = create(:project, :repository_private, :github_imported,
                            :test_repo, :remote_mirror, creator: user)
           create(:deploy_key, user: user)
           create(:key, user: user)

ee/spec/requests/projects/merge_requests_controller_spec.rb

@@ -19,7 +19,7 @@ describe Projects::MergeRequestsController do
     context 'when the project requires code owner approval' do
       before do
         stub_licensed_features(code_owners: true, code_owner_approval_required: true)
-        project.update!(merge_requests_require_code_owner_approval: true)
+
         get_edit # Warm the cache
       end
 

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -537,7 +537,6 @@ Project:
 - external_webhook_token
 - pages_https_only
 - merge_requests_disable_committers_approval
-- merge_requests_require_code_owner_approval
 - require_password_to_approve
 ProjectTracingSetting:
 - external_url