Add latest changes from gitlab-org/gitlab@master

3 files changed, 20 insertions, 1 deletions

diff --git a/db/post_migrate/20210706112800_remove_cloud_license_enabled_from_application_settings.rb b/db/post_migrate/20210706112800_remove_cloud_license_enabled_from_application_settings.rb
new file mode 100644
index 00000000000..7224e84c1b3
--- /dev/null
+++ b/db/post_migrate/20210706112800_remove_cloud_license_enabled_from_application_settings.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveCloudLicenseEnabledFromApplicationSettings < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      remove_column :application_settings, :cloud_license_enabled
+    end
+  end
+
+  def down
+    with_lock_retries do
+      add_column :application_settings, :cloud_license_enabled, :boolean, null: false, default: false
+    end
+  end
+end
diff --git a/db/schema_migrations/20210706112800 b/db/schema_migrations/20210706112800
new file mode 100644
index 00000000000..f1f00867472
--- /dev/null
+++ b/db/schema_migrations/20210706112800
@@ -0,0 +1 @@
+5dd1596d0d6e6f5aa39cbf8a65be294650bead7a099cf50917b438cf75529257
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 88b7693b749..163ac643a3d 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9598,7 +9598,6 @@ CREATE TABLE application_settings (
     encrypted_cloud_license_auth_token text,
     encrypted_cloud_license_auth_token_iv text,
     secret_detection_revocation_token_types_url text,
-    cloud_license_enabled boolean DEFAULT false NOT NULL,
     disable_feed_token boolean DEFAULT false NOT NULL,
     personal_access_token_prefix text,
     rate_limiting_response_text text,