diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-24 11:26:44 +0000 |
| commit | 806c748852e7d62dfa13fd2d039949ce0f875a12 (patch) | |
| tree | ad2142c9c63d3a3aca7d71a048bda460b1767389 /db/schema.rb | |
| parent | a82e3d30b2ef625dae0d2f25324460402f960f09 (diff) | |
| parent | f40403cce1a8185254e74dff54ee687b7953093b (diff) | |
| download | gitlab-ce-806c748852e7d62dfa13fd2d039949ce0f875a12.tar.gz | |
Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groups
# Conflicts:
# doc/api/v3_to_v4.md
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 532103b8216..82bccda580a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -111,6 +111,7 @@ ActiveRecord::Schema.define(version: 20170216141440) do t.boolean "plantuml_enabled" t.integer "max_pages_size", default: 100, null: false t.integer "terminal_max_session_time", default: 0, null: false + t.string "default_artifacts_expire_in", default: '0', null: false end create_table "audit_events", force: :cascade do |t| |