diff options
author | James Lopez <james@jameslopez.es> | 2016-04-14 18:12:10 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-04-14 18:12:10 +0200 |
commit | e5f7a545308922bf790f1ef8becb6e8dcd573f95 (patch) | |
tree | 891091eefc62c616e29ee4547a46ccc640974771 /db/schema.rb | |
parent | 46d1cf43a43a4d7a25f25be97d1fee79cefdc773 (diff) | |
parent | dd9ced0af9514c0cf511c8f0f10d19c014fa4d19 (diff) | |
download | gitlab-ce-e5f7a545308922bf790f1ef8becb6e8dcd573f95.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
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 df4c65a0625..4970a07b72e 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 |