Merge branch 'revert-appearances-description-html-not-null' into 'master'
Re-allow appearances.description_html to be NULL Closes #36919 See merge request !13806
This commit is contained in:
commit
6b803a06f7
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Re-allow appearances.description_html to be NULL
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -7,7 +7,7 @@ class CleanupAppearancesSchema < ActiveRecord::Migration
|
||||||
# Set this constant to true if this migration requires downtime.
|
# Set this constant to true if this migration requires downtime.
|
||||||
DOWNTIME = false
|
DOWNTIME = false
|
||||||
|
|
||||||
NOT_NULL_COLUMNS = %i[title description description_html created_at updated_at]
|
NOT_NULL_COLUMNS = %i[title description created_at updated_at]
|
||||||
|
|
||||||
TIME_COLUMNS = %i[created_at updated_at]
|
TIME_COLUMNS = %i[created_at updated_at]
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
|
||||||
|
# for more information on how to write migrations for GitLab.
|
||||||
|
|
||||||
|
class AllowAppearancesDescriptionHtmlNull < ActiveRecord::Migration
|
||||||
|
include Gitlab::Database::MigrationHelpers
|
||||||
|
|
||||||
|
# Set this constant to true if this migration requires downtime.
|
||||||
|
DOWNTIME = false
|
||||||
|
|
||||||
|
def up
|
||||||
|
change_column_null :appearances, :description_html, true
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
# This column should not have a `NOT NULL` class, so we don't want to revert
|
||||||
|
# back to re-adding it.
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20170820100558) do
|
ActiveRecord::Schema.define(version: 20170824162758) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -34,7 +34,7 @@ ActiveRecord::Schema.define(version: 20170820100558) do
|
||||||
t.string "logo"
|
t.string "logo"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.text "description_html", null: false
|
t.text "description_html"
|
||||||
t.integer "cached_markdown_version"
|
t.integer "cached_markdown_version"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue