diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-03 10:37:04 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-03 10:37:04 +0000 |
| commit | 47f00afb8b7de642c4a19a4b291e540b93eb441c (patch) | |
| tree | ad347483dbb3aa36ef169934c3ecc2191d4b726d | |
| parent | c972e0f9415d237911f74d986f3b5485c89494e9 (diff) | |
| parent | 1c7bb9d51c775bd43a3334786d01685f4ce2ade0 (diff) | |
| download | gitlab-ci-47f00afb8b7de642c4a19a4b291e540b93eb441c.tar.gz | |
Merge branch 'timeout' into 'master'
Increase default build timeout
https://dev.gitlab.org/gitlab/gitlab-ci/issues/244
@sytses asked to increase this.
See merge request !112
| -rw-r--r-- | db/migrate/20150602000240_change_default_build_timeout.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/db/migrate/20150602000240_change_default_build_timeout.rb b/db/migrate/20150602000240_change_default_build_timeout.rb new file mode 100644 index 0000000..7234169 --- /dev/null +++ b/db/migrate/20150602000240_change_default_build_timeout.rb @@ -0,0 +1,9 @@ +class ChangeDefaultBuildTimeout < ActiveRecord::Migration + def up + change_column :projects, :timeout, :integer, default: 3600, null: false + end + + def down + change_column :projects, :timeout, :integer, default: 1800, null: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 04ad428..1e4f9cd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150508011360) do +ActiveRecord::Schema.define(version: 20150602000240) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -82,7 +82,7 @@ ActiveRecord::Schema.define(version: 20150508011360) do create_table "projects", force: true do |t| t.string "name", null: false - t.integer "timeout", default: 1800, null: false + t.integer "timeout", default: 3600, null: false t.datetime "created_at" t.datetime "updated_at" t.string "token" |