Automatic merge of gitlab-org/gitlab master

config/environments/production.rb

@@ -54,9 +54,6 @@ Rails.application.configure do
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present?
 
-  # We use a env var to keep at old default until we enable this for GitLab.com
-  config.active_record.legacy_connection_handling = !Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_RAILS_61_CONNECTION_HANDLING', false))
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 

db/migrate/20210601132134_remove_partial_index_for_hashed_storage_migration.rb

+# frozen_string_literal: true
+
+class RemovePartialIndexForHashedStorageMigration < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index :projects, :id, name: 'index_on_id_partial_with_legacy_storage'
+  end
+
+  def down
+    add_concurrent_index :projects, :id, where: 'storage_version < 2 or storage_version IS NULL', name: 'index_on_id_partial_with_legacy_storage'
+  end
+end

db/schema_migrations/20210601132134

+966299fecd160b594f0837f19cc01b38fc365fa749982f9245c296d912e3eb2f
\ No newline at end of file

db/structure.sql

@@ -24076,8 +24076,6 @@ CREATE INDEX index_oauth_openid_requests_on_access_grant_id ON oauth_openid_requ
 
 CREATE UNIQUE INDEX index_on_deploy_keys_id_and_type_and_public ON keys USING btree (id, type) WHERE (public = true);
 
-CREATE INDEX index_on_id_partial_with_legacy_storage ON projects USING btree (id) WHERE ((storage_version < 2) OR (storage_version IS NULL));
-
 CREATE INDEX index_on_identities_lower_extern_uid_and_provider ON identities USING btree (lower((extern_uid)::text), provider);
 
 CREATE UNIQUE INDEX index_on_instance_statistics_recorded_at_and_identifier ON analytics_usage_trends_measurements USING btree (identifier, recorded_at);

doc/.vale/gitlab/HeaderGerunds.yml

+---
+# Error: gitlab.HeaderGerunds
+#
+# Checks for headers that start with gerunds (ing words).
+# Related to: https://docs.gitlab.com/ee/development/documentation/structure.html
+#
+# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
+extends: substitution
+message: 'Can this header start with an imperative verb, instead of a gerund (ing word)?'
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/#heading-titles
+level: suggestion
+scope: heading
+swap:
+  - '^\w*ing.*': 'Troubleshooting'

ee/app/assets/javascripts/billings/components/account_verification_modal.vue

@@ -102,7 +102,6 @@ export default {
       }
 
       this.isLoading = false;
-      this.$refs.zuora.contentWindow.postMessage('resize', this.allowedOrigin);
     },
     isEventAllowedForOrigin(event) {
       try {
@@ -143,7 +142,6 @@ export default {
     <gl-loading-icon v-if="isLoading" size="lg" />
     <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
     <iframe
-      v-show="!isLoading"
       ref="zuora"
       :src="iframeSrc"
       style="border: none"

spec/features/groups/import_export/connect_instance_spec.rb

@@ -59,6 +59,8 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do
       expect(page).to have_content 'Showing 1-1 of %{total} groups from %{url}' % { url: source_url, total: total }
       expect(page).to have_content stub_path
 
+      visit '/'
+
       wait_for_all_requests
     end
   end