Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20200211174946_add_auto_renew_to_gitlab_subscriptions.rb b/db/migrate/20200211174946_add_auto_renew_to_gitlab_subscriptions.rb
new file mode 100644
index 00000000000..6bce74bb8f8
--- /dev/null
+++ b/db/migrate/20200211174946_add_auto_renew_to_gitlab_subscriptions.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddAutoRenewToGitlabSubscriptions < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :gitlab_subscription_histories, :auto_renew, :boolean
+    add_column :gitlab_subscriptions, :auto_renew, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9d3ba5f3645..33724ef59b5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1912,6 +1912,7 @@ ActiveRecord::Schema.define(version: 2020_02_14_034836) do
     t.bigint "gitlab_subscription_id", null: false
     t.datetime_with_timezone "created_at"
     t.date "trial_starts_on"
+    t.boolean "auto_renew"
     t.index ["gitlab_subscription_id"], name: "index_gitlab_subscription_histories_on_gitlab_subscription_id"
   end
 
@@ -1927,6 +1928,7 @@ ActiveRecord::Schema.define(version: 2020_02_14_034836) do
     t.integer "seats", default: 0
     t.boolean "trial", default: false
     t.date "trial_starts_on"
+    t.boolean "auto_renew"
     t.index ["hosted_plan_id"], name: "index_gitlab_subscriptions_on_hosted_plan_id"
     t.index ["namespace_id"], name: "index_gitlab_subscriptions_on_namespace_id", unique: true
   end