diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-03 14:53:46 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-03 14:53:46 +0100 |
commit | 555a3cf5bbfb78d697c70339bc65047d90e26d95 (patch) | |
tree | 6d84eab8c0504df310e66ab45a61e862a4501d7f /db | |
parent | f3732e167b3d1ab58cbd49261ef7624959387cab (diff) | |
download | gitlab-ce-555a3cf5bbfb78d697c70339bc65047d90e26d95.tar.gz |
Updated schema.rb with patch mode
Diffstat (limited to 'db')
-rw-r--r-- | db/schema.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/db/schema.rb b/db/schema.rb index c3fbb74e878..ea303678ac0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -63,7 +63,6 @@ ActiveRecord::Schema.define(version: 20170428123910) 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 @@ -112,16 +111,17 @@ ActiveRecord::Schema.define(version: 20170428123910) 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" t.integer "unique_ips_limit_time_window" t.boolean "unique_ips_limit_enabled", default: false, null: false t.decimal "polling_interval_multiplier", default: 1.0, null: false - t.integer "cached_markdown_version" t.boolean "usage_ping_enabled", default: true, null: false t.string "uuid" - t.boolean "clientside_sentry_enabled", default: false + t.integer "cached_markdown_version" + t.boolean "clientside_sentry_enabled", default: false, null: false t.string "clientside_sentry_dsn" end @@ -735,8 +735,8 @@ ActiveRecord::Schema.define(version: 20170428123910) do t.integer "visibility_level", default: 20, null: false t.boolean "request_access_enabled", default: false, null: false t.datetime "deleted_at" - t.text "description_html" t.boolean "lfs_enabled" + t.text "description_html" t.integer "parent_id" t.boolean "require_two_factor_authentication", default: false, null: false t.integer "two_factor_grace_period", default: 48, null: false @@ -969,9 +969,9 @@ ActiveRecord::Schema.define(version: 20170428123910) do t.boolean "lfs_enabled" t.text "description_html" t.boolean "only_allow_merge_if_all_discussions_are_resolved" - t.integer "auto_cancel_pending_pipelines", default: 0, null: false t.boolean "printing_merge_request_link_enabled", default: true, null: false t.string "import_jid" + t.integer "auto_cancel_pending_pipelines", default: 0, null: false t.integer "cached_markdown_version" end @@ -1074,7 +1074,6 @@ ActiveRecord::Schema.define(version: 20170428123910) do t.string "line_code" t.string "note_type" t.text "position" - t.string "in_reply_to_discussion_id" end add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree @@ -1324,10 +1323,10 @@ ActiveRecord::Schema.define(version: 20170428123910) do t.string "organization" t.boolean "authorized_projects_populated" t.boolean "ghost" - t.date "last_activity_on" t.boolean "notified_of_own_activity" t.boolean "require_two_factor_authentication_from_group", default: false, null: false t.integer "two_factor_grace_period", default: 48, null: false + t.date "last_activity_on" end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |