diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
| commit | 5395e6175e77d3cd8800bb9f41c09d59934b502f (patch) | |
| tree | 2234488f40eb4f7aa6920fbe2ab41b1d6f53e14e /db/schema.rb | |
| parent | 39d853f5bd9492fa8dfc8e07ec11070705d3c879 (diff) | |
| parent | c0678f2d281242601560e2646cab1aa8a349c4bb (diff) | |
| download | gitlab-ce-5395e6175e77d3cd8800bb9f41c09d59934b502f.tar.gz | |
Merge branch 'master' into issue_3508issue_3508
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index e63e22ce864..44482de467e 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: 20160331133914) do +ActiveRecord::Schema.define(version: 20160331223143) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -44,7 +44,6 @@ ActiveRecord::Schema.define(version: 20160331133914) do t.datetime "updated_at" t.string "home_page_url" t.integer "default_branch_protection", default: 2 - t.boolean "twitter_sharing_enabled", default: true t.text "restricted_visibility_levels" t.boolean "version_check_enabled", default: true t.integer "max_attachment_size", default: 10, null: false @@ -638,6 +637,18 @@ ActiveRecord::Schema.define(version: 20160331133914) do add_index "notes", ["project_id"], name: "index_notes_on_project_id", using: :btree add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree + create_table "notification_settings", force: :cascade do |t| + t.integer "user_id", null: false + t.integer "source_id", null: false + t.string "source_type", null: false + t.integer "level", default: 0, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree + add_index "notification_settings", ["user_id"], name: "index_notification_settings_on_user_id", using: :btree + create_table "oauth_access_grants", force: :cascade do |t| t.integer "resource_owner_id", null: false t.integer "application_id", null: false |