summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-01-13 13:19:54 +0100
committerJames Lopez <james@jameslopez.es>2017-01-13 13:19:54 +0100
commit9a59ea3d3ba47c384a9b15e5e5a95f093ad5d0f6 (patch)
treef1a2b51904e0bf533b0c09095ef383a9e92406bd /db/schema.rb
parent33e94dc50e6f2502b2b65fb7c1ebfd5d4f03322a (diff)
parent4b43126d08972c201551fbd1fe42e85847d5e03f (diff)
downloadgitlab-ce-9a59ea3d3ba47c384a9b15e5e5a95f093ad5d0f6.tar.gz
Merge branch 'master' into 8-16-stable
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index f3bf7ced393..c58a886b0fa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -107,6 +107,8 @@ ActiveRecord::Schema.define(version: 20170106172224) do
t.integer "housekeeping_full_repack_period", default: 50, null: false
t.integer "housekeeping_gc_period", default: 200, null: false
t.boolean "html_emails_enabled", default: true
+ t.string "plantuml_url"
+ t.boolean "plantuml_enabled"
end
create_table "audit_events", force: :cascade do |t|