diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
| commit | 71da2e0b56a89fc87f2da3685bdebb333690593a (patch) | |
| tree | be6418658f118746ab158be162622fe8cb5f0b0e /db/schema.rb | |
| parent | 011a905a821e2ff0cd2d9885ef93764018eb8346 (diff) | |
| parent | 44501820152083d231459223fe09b9d9641b7c1e (diff) | |
| download | gitlab-ce-71da2e0b56a89fc87f2da3685bdebb333690593a.tar.gz | |
Merge remote-tracking branch 'origin/master' into docker-registry
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/db/schema.rb b/db/schema.rb index bf46028d23f..7ea16e21358 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -70,16 +70,16 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.string "recaptcha_site_key" t.string "recaptcha_private_key" t.integer "metrics_port", default: 8089 + t.boolean "akismet_enabled", default: false + t.string "akismet_api_key" t.integer "metrics_sample_interval", default: 15 t.boolean "sentry_enabled", default: false t.string "sentry_dsn" - t.boolean "akismet_enabled", default: false - t.string "akismet_api_key" t.boolean "email_author_in_body", default: false t.integer "default_group_visibility" t.boolean "repository_checks_enabled", default: false - t.integer "metrics_packet_size", default: 1 t.text "shared_runners_text" + t.integer "metrics_packet_size", default: 1 end create_table "audit_events", force: :cascade do |t| @@ -426,10 +426,10 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.string "state" t.integer "iid" t.integer "updated_by_id" - t.integer "moved_to_id" t.boolean "confidential", default: false t.datetime "deleted_at" t.date "due_date" + t.integer "moved_to_id" end add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree @@ -716,8 +716,8 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.integer "project_id" t.text "data" t.text "encrypted_credentials" - t.text "encrypted_credentials_iv" - t.text "encrypted_credentials_salt" + t.string "encrypted_credentials_iv" + t.string "encrypted_credentials_salt" end create_table "projects", force: :cascade do |t| @@ -817,9 +817,9 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.string "type" t.string "title" t.integer "project_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.boolean "active", null: false + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "active", default: false, null: false t.text "properties" t.boolean "template", default: false t.boolean "push_events", default: true @@ -1026,6 +1026,7 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.boolean "enable_ssl_verification", default: true t.boolean "build_events", default: false, null: false t.boolean "wiki_page_events", default: false, null: false + t.string "token" end add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree |