diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-25 10:13:31 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-01 12:42:31 -0500 |
| commit | 0e379ed967879118d08553ed705ef7b50d221043 (patch) | |
| tree | 2a9462b7805ab44bb67d2cc55b1f4a71014819cc /db/schema.rb | |
| parent | ab974152dac919d5f9febb6399951bc15a3c1ddd (diff) | |
| download | gitlab-ce-0e379ed967879118d08553ed705ef7b50d221043.tar.gz | |
Merge branch 'revert-appearances-description-html-not-null' into 'master'
Re-allow appearances.description_html to be NULL
Closes #36919
See merge request !13806
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 2ccf52b7b74..3e2c407ddfc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # 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 enable_extension "plpgsql" @@ -34,7 +34,7 @@ ActiveRecord::Schema.define(version: 20170820100558) do t.string "logo" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.text "description_html", null: false + t.text "description_html" t.integer "cached_markdown_version" end |