From d91f5211693e913da5df110b8de841fad87e3653 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jan 2020 18:07:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../20191209143606_add_deleted_at_to_description_versions.rb | 9 +++++++++ db/schema.rb | 1 + 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20191209143606_add_deleted_at_to_description_versions.rb (limited to 'db') diff --git a/db/migrate/20191209143606_add_deleted_at_to_description_versions.rb b/db/migrate/20191209143606_add_deleted_at_to_description_versions.rb new file mode 100644 index 00000000000..02a3d1271c2 --- /dev/null +++ b/db/migrate/20191209143606_add_deleted_at_to_description_versions.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddDeletedAtToDescriptionVersions < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :description_versions, :deleted_at, :datetime_with_timezone + end +end diff --git a/db/schema.rb b/db/schema.rb index 39ada44b5aa..ae1b8533102 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1410,6 +1410,7 @@ ActiveRecord::Schema.define(version: 2020_01_21_132641) do t.integer "merge_request_id" t.integer "epic_id" t.text "description" + t.datetime_with_timezone "deleted_at" t.index ["epic_id"], name: "index_description_versions_on_epic_id", where: "(epic_id IS NOT NULL)" t.index ["issue_id"], name: "index_description_versions_on_issue_id", where: "(issue_id IS NOT NULL)" t.index ["merge_request_id"], name: "index_description_versions_on_merge_request_id", where: "(merge_request_id IS NOT NULL)" -- cgit v1.2.3