diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-07 18:45:03 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-07 18:45:03 +0000 |
| commit | 57e709757f601878d2a688d092de1b1c97bdff7a (patch) | |
| tree | b8cf6967cb9edffe9d8be7294dccc4f86ab2c112 /db | |
| parent | b240d86d751890216af978f1942990201f5ccadf (diff) | |
| parent | 993a1edd4f0501fa8af261e9a81d8d9f200ac3b0 (diff) | |
| download | gitlab-ce-57e709757f601878d2a688d092de1b1c97bdff7a.tar.gz | |
Merge branch 'zj-variables-build-job' into 'master'
Rename BUILD to JOB in CI Variables
Closes #29053
See merge request !9756
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 6f83a82c3c1..21ab9bf9eab 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -61,6 +61,7 @@ ActiveRecord::Schema.define(version: 20170306170512) do t.boolean "shared_runners_enabled", default: true, null: false t.integer "max_artifacts_size", default: 100, null: false t.string "runners_registration_token" + t.integer "max_pages_size", default: 100, null: false t.boolean "require_two_factor_authentication", default: false t.integer "two_factor_grace_period", default: 48 t.boolean "metrics_enabled", default: false @@ -109,7 +110,6 @@ ActiveRecord::Schema.define(version: 20170306170512) do t.boolean "html_emails_enabled", default: true t.string "plantuml_url" 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 t.integer "unique_ips_limit_per_user" @@ -771,8 +771,8 @@ ActiveRecord::Schema.define(version: 20170306170512) do t.integer "visibility_level", default: 20, null: false t.boolean "request_access_enabled", default: false, null: false t.datetime "deleted_at" - t.boolean "lfs_enabled" t.text "description_html" + t.boolean "lfs_enabled" t.integer "parent_id" end |