diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-06 16:14:23 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:58:15 +0200 |
| commit | f5e602ee0f8d95617adf6fb9b5a1a132a471fb12 (patch) | |
| tree | 00e285a8a41fcca51d7b105e4db9837d421b8257 /db | |
| parent | 1e138767a652d86458d38665b98c9c2e5d4c3cb8 (diff) | |
| download | gitlab-ce-f5e602ee0f8d95617adf6fb9b5a1a132a471fb12.tar.gz | |
Rename maximum_job_timeout to maximum_timeout
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb | 9 | ||||
| -rw-r--r-- | db/migrate/20180219153455_add_maximum_timeout_to_ci_runners.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb b/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb deleted file mode 100644 index 1ad7bb86e72..00000000000 --- a/db/migrate/20180219153455_add_maximum_job_timeout_to_ci_runners.rb +++ /dev/null @@ -1,9 +0,0 @@ -class AddMaximumJobTimeoutToCiRunners < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def change - add_column :ci_runners, :maximum_job_timeout, :integer - end -end diff --git a/db/migrate/20180219153455_add_maximum_timeout_to_ci_runners.rb b/db/migrate/20180219153455_add_maximum_timeout_to_ci_runners.rb new file mode 100644 index 00000000000..072e696a43e --- /dev/null +++ b/db/migrate/20180219153455_add_maximum_timeout_to_ci_runners.rb @@ -0,0 +1,9 @@ +class AddMaximumTimeoutToCiRunners < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :ci_runners, :maximum_timeout, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 920d71e0110..a2967409703 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -463,7 +463,7 @@ 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_job_timeout" + t.integer "maximum_timeout" t.string "ip_address" end |