Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/db/production/settings_spec.rb b/spec/db/production/settings_spec.rb
index f17720466c0..a7cd7201c89 100644
--- a/spec/db/production/settings_spec.rb
+++ b/spec/db/production/settings_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe 'seed production settings' do
         stub_env('GITLAB_PROMETHEUS_METRICS_ENABLED', 'true')
       end
 
-      it 'prometheus_metrics_enabled is set to true ' do
+      it 'prometheus_metrics_enabled is set to true' do
         load(settings_file)
 
         expect(settings.prometheus_metrics_enabled).to eq(true)
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index c35f3831a58..a15b9624c9d 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Database schema' do
     audit_events_part_5fc467ac26: %w[author_id entity_id target_id],
     award_emoji: %w[awardable_id user_id],
     aws_roles: %w[role_external_id],
-    boards: %w[milestone_id],
+    boards: %w[milestone_id iteration_id],
     chat_names: %w[chat_id team_id user_id],
     chat_teams: %w[team_id],
     ci_builds: %w[erased_by_id runner_id trigger_request_id user_id],
@@ -86,7 +86,7 @@ RSpec.describe 'Database schema' do
     users_star_projects: %w[user_id],
     vulnerability_identifiers: %w[external_id],
     vulnerability_scanners: %w[external_id],
-    web_hooks: %w[service_id group_id]
+    web_hooks: %w[group_id]
   }.with_indifferent_access.freeze
 
   context 'for table' do
@@ -184,6 +184,7 @@ RSpec.describe 'Database schema' do
     "ApplicationSetting" => %w[repository_storages_weighted],
     "AlertManagement::Alert" => %w[payload],
     "Ci::BuildMetadata" => %w[config_options config_variables],
+    "ExperimentUser" => %w[context],
     "Geo::Event" => %w[payload],
     "GeoNodeStatus" => %w[status],
     "Operations::FeatureFlagScope" => %w[strategies],