Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 7 insertions, 16 deletions

diff --git a/spec/db/production/settings_spec.rb b/spec/db/production/settings_spec.rb
index 84f7ae12728..f17720466c0 100644
--- a/spec/db/production/settings_spec.rb
+++ b/spec/db/production/settings_spec.rb
@@ -62,4 +62,11 @@ RSpec.describe 'seed production settings' do
       end
     end
   end
+
+  context 'CI JWT signing key' do
+    it 'writes valid RSA key to the database' do
+      expect { load(settings_file) }.to change { settings.reload.ci_jwt_signing_key }.from(nil)
+      expect { OpenSSL::PKey::RSA.new(settings.ci_jwt_signing_key) }.not_to raise_error
+    end
+  end
 end
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 06fafbddced..c35f3831a58 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -241,25 +241,9 @@ RSpec.describe 'Database schema' do
   context 'primary keys' do
     let(:exceptions) do
       %i(
-        analytics_language_trend_repository_languages
-        approval_project_rules_protected_branches
-        ci_build_trace_sections
-        deployment_merge_requests
         elasticsearch_indexed_namespaces
         elasticsearch_indexed_projects
-        issue_assignees
-        issues_prometheus_alert_events
-        issues_self_managed_prometheus_alert_events
         merge_request_context_commit_diff_files
-        merge_request_diff_commits
-        merge_request_diff_files
-        milestone_releases
-        project_authorizations
-        project_pages_metadata
-        push_event_payloads
-        repository_languages
-        user_interacted_projects
-        users_security_dashboard_projects
       )
     end