Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20191127151629_add_trial_starts_on_to_gitlab_subscriptions.rb b/db/migrate/20191127151629_add_trial_starts_on_to_gitlab_subscriptions.rb
new file mode 100644
index 00000000000..2528aa9c2c8
--- /dev/null
+++ b/db/migrate/20191127151629_add_trial_starts_on_to_gitlab_subscriptions.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddTrialStartsOnToGitlabSubscriptions < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :gitlab_subscriptions, :trial_starts_on, :date, null: true
+    add_column :gitlab_subscription_histories, :trial_starts_on, :date, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5aa13fa8c72..ac2372a63d0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1882,6 +1882,7 @@ ActiveRecord::Schema.define(version: 2019_12_08_071112) do
     t.integer "change_type", limit: 2
     t.bigint "gitlab_subscription_id", null: false
     t.datetime_with_timezone "created_at"
+    t.date "trial_starts_on"
     t.index ["gitlab_subscription_id"], name: "index_gitlab_subscription_histories_on_gitlab_subscription_id"
   end
 
@@ -1896,6 +1897,7 @@ ActiveRecord::Schema.define(version: 2019_12_08_071112) do
     t.integer "max_seats_used", default: 0
     t.integer "seats", default: 0
     t.boolean "trial", default: false
+    t.date "trial_starts_on"
     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