Automatic merge of gitlab-org/gitlab master

changelogs/unreleased/migration-add-trial-extension-type-to-gitlab-subscriptions.yml

+---
+title: 'Migration: add trial extension type to gitlab_subscription'
+merge_request: 56460
+author:
+type: added

db/migrate/20210316094047_add_trial_extension_type_to_gitlab_subscription_histories.rb

+# frozen_string_literal: true
+
+class AddTrialExtensionTypeToGitlabSubscriptionHistories < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :gitlab_subscription_histories, :trial_extension_type, :smallint
+  end
+end

db/migrate/20210316094323_add_trial_extension_type_to_gitlab_subscriptions.rb

+# frozen_string_literal: true
+
+class AddTrialExtensionTypeToGitlabSubscriptions < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_column :gitlab_subscriptions, :trial_extension_type, :smallint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :gitlab_subscriptions, :trial_extension_type
+    end
+  end
+end

db/schema_migrations/20210316094047

+208df71aa7c2dc447ea8f63ca8cc02344a78bd739c7a0e9457c665bfb831a879
\ No newline at end of file

db/schema_migrations/20210316094323

+e1d83121dd3bd1a608626910a8238546816870f6f36840d96b2b4ac3415af985
\ No newline at end of file

db/structure.sql

@@ -13051,7 +13051,8 @@ CREATE TABLE gitlab_subscription_histories (
     gitlab_subscription_id bigint NOT NULL,
     created_at timestamp with time zone,
     trial_starts_on date,
-    auto_renew boolean
+    auto_renew boolean,
+    trial_extension_type smallint
 );
 
 CREATE SEQUENCE gitlab_subscription_histories_id_seq
@@ -13078,7 +13079,8 @@ CREATE TABLE gitlab_subscriptions (
     trial_starts_on date,
     auto_renew boolean,
     seats_in_use integer DEFAULT 0 NOT NULL,
-    seats_owed integer DEFAULT 0 NOT NULL
+    seats_owed integer DEFAULT 0 NOT NULL,
+    trial_extension_type smallint
 );
 
 CREATE SEQUENCE gitlab_subscriptions_id_seq

doc/user/project/merge_requests/code_quality.md

@@ -15,7 +15,7 @@ source code quality using GitLab Code Quality.
 
 Code Quality:
 
-- Uses [Code Climate Engines](https://codeclimate.com), which are
+- Uses [Engines](https://docs.codeclimate.com/docs/list-of-engines) supported by Code Climate, which are
   free and open source. Code Quality does not require a Code Climate
   subscription.
 - Runs in [pipelines](../../../ci/pipelines/index.md) using a Docker image built in the