diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 15:06:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 15:06:26 +0000 |
commit | 69944ffb68788d190e81ff7e33db5dcb6c903184 (patch) | |
tree | 4112a1285f186c140749e8410a8a2788b6812500 /db | |
parent | 1b7381e998ff4b33ec8f633766030082e95f10c8 (diff) | |
download | gitlab-ce-69944ffb68788d190e81ff7e33db5dcb6c903184.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
3 files changed, 21 insertions, 2 deletions
diff --git a/db/migrate/20191112115247_add_cached_markdown_version_to_vulnerabilities.rb b/db/migrate/20191112115247_add_cached_markdown_version_to_vulnerabilities.rb new file mode 100644 index 00000000000..b0c513737e8 --- /dev/null +++ b/db/migrate/20191112115247_add_cached_markdown_version_to_vulnerabilities.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddCachedMarkdownVersionToVulnerabilities < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :vulnerabilities, :cached_markdown_version, :integer + end +end diff --git a/db/post_migrate/20191112115317_change_vulnerabilities_title_html_to_nullable.rb b/db/post_migrate/20191112115317_change_vulnerabilities_title_html_to_nullable.rb new file mode 100644 index 00000000000..6e0f3247410 --- /dev/null +++ b/db/post_migrate/20191112115317_change_vulnerabilities_title_html_to_nullable.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class ChangeVulnerabilitiesTitleHtmlToNullable < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + change_column_null :vulnerabilities, :title_html, true + end +end diff --git a/db/schema.rb b/db/schema.rb index b5991904302..0c816d4764e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_11_11_115431) do +ActiveRecord::Schema.define(version: 2019_11_12_115317) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -3928,7 +3928,7 @@ ActiveRecord::Schema.define(version: 2019_11_11_115431) do t.datetime_with_timezone "created_at", null: false t.datetime_with_timezone "updated_at", null: false t.string "title", limit: 255, null: false - t.text "title_html", null: false + t.text "title_html" t.text "description" t.text "description_html" t.bigint "start_date_sourcing_milestone_id" @@ -3941,6 +3941,7 @@ ActiveRecord::Schema.define(version: 2019_11_11_115431) do t.integer "confidence", limit: 2, null: false t.boolean "confidence_overridden", default: false t.integer "report_type", limit: 2, null: false + t.integer "cached_markdown_version" t.index ["author_id"], name: "index_vulnerabilities_on_author_id" t.index ["closed_by_id"], name: "index_vulnerabilities_on_closed_by_id" t.index ["due_date_sourcing_milestone_id"], name: "index_vulnerabilities_on_due_date_sourcing_milestone_id" |