Merge branch '335079-remove-framework-column-from-frameworks' into 'master'

Delete framework column from project_compliance_framework_settings

See merge request gitlab-org/gitlab!65546

db/post_migrate/20210706120847_remove_framework_column_from_compliance_management_frameworks.rb

+# frozen_string_literal: true
+
+class RemoveFrameworkColumnFromComplianceManagementFrameworks < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :project_compliance_framework_settings, :framework, :smallint
+  end
+end

db/schema_migrations/20210706120847

+0fffffc44c32a936760424541e183b1a41938750d4e10da9dd76c2a09094a07b
\ No newline at end of file

db/structure.sql

@@ -16697,7 +16697,6 @@ ALTER SEQUENCE project_ci_cd_settings_id_seq OWNED BY project_ci_cd_settings.id;
 
 CREATE TABLE project_compliance_framework_settings (
     project_id bigint NOT NULL,
-    framework smallint,
     framework_id bigint,
     CONSTRAINT check_d348de9e2d CHECK ((framework_id IS NOT NULL))
 );

ee/spec/lib/ee/gitlab/search_results_spec.rb

@@ -25,6 +25,6 @@ RSpec.describe Gitlab::SearchResults do
   end
 
   def search
-    subject.objects('projects').map { |project| project.compliance_framework_setting.framework }
+    subject.objects('projects').map { |project| project.compliance_framework_setting }
   end
 end