diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 16:29:13 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-07-31 16:29:13 +0000 |
| commit | 1b27c45753a55eaba3c935138da65e3e7ff105eb (patch) | |
| tree | 8637500714bde29bacd50b76bc977636362dbf32 /db/schema.rb | |
| parent | 9eb87018b2659b07d5ee9c72a214987c86eca8cb (diff) | |
| parent | 1a95603510accdcdb233fa00f101da119eb1fa5c (diff) | |
| download | gitlab-ce-1b27c45753a55eaba3c935138da65e3e7ff105eb.tar.gz | |
Merge branch 'master' into '41416-making-instance-wide-data-tools-more-accessible'
# Conflicts:
# app/models/application_setting.rb
# lib/api/settings.rb
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 fbacff19591..1d6896b7669 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -394,6 +394,7 @@ ActiveRecord::Schema.define(version: 20180722103201) do t.datetime_with_timezone "expire_at" t.string "file" t.binary "file_sha256" + t.integer "file_format", limit: 2 end add_index "ci_job_artifacts", ["expire_at", "job_id"], name: "index_ci_job_artifacts_on_expire_at_and_job_id", using: :btree |