diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-06 16:25:13 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:58:16 +0200 |
| commit | d58d3098f159a17fbcf1ae27165c249722990988 (patch) | |
| tree | cb1a8732227282cbfe85ded3e1d7dcc5ab5308ce /db | |
| parent | f5e602ee0f8d95617adf6fb9b5a1a132a471fb12 (diff) | |
| download | gitlab-ce-d58d3098f159a17fbcf1ae27165c249722990988.tar.gz | |
Rename used_timeout to timeout
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20180301010859_create_ci_builds_metadata_table.rb | 2 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20180301010859_create_ci_builds_metadata_table.rb b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb index cd7824d7788..72c204026d8 100644 --- a/db/migrate/20180301010859_create_ci_builds_metadata_table.rb +++ b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb @@ -6,7 +6,7 @@ class CreateCiBuildsMetadataTable < ActiveRecord::Migration def change create_table :ci_builds_metadata, id: false do |t| t.integer :build_id, null: false - t.integer :used_timeout + t.integer :timeout t.integer :timeout_source, null: false, default: 1 t.primary_key :build_id diff --git a/db/schema.rb b/db/schema.rb index a2967409703..a14823dfa15 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -330,7 +330,7 @@ ActiveRecord::Schema.define(version: 20180327101207) do add_index "ci_builds", ["user_id"], name: "index_ci_builds_on_user_id", using: :btree create_table "ci_builds_metadata", primary_key: "build_id", force: :cascade do |t| - t.integer "used_timeout" + t.integer "timeout" t.integer "timeout_source", default: 1, null: false end @@ -463,8 +463,8 @@ ActiveRecord::Schema.define(version: 20180327101207) do t.boolean "run_untagged", default: true, null: false t.boolean "locked", default: false, null: false t.integer "access_level", default: 0, null: false - t.integer "maximum_timeout" t.string "ip_address" + t.integer "maximum_timeout" end add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree |