diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-20 15:55:11 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-20 15:55:11 +0000 |
commit | 8b2a2fc5b0436b0f8e49a5f77b00c7dfbd3e7929 (patch) | |
tree | 5db76b4636b27040d543e7a91af9971a1e3eded6 | |
parent | 92430f019495d6292144e0207378a5e6786d56c3 (diff) | |
parent | 8a2a01e023b719af7c5823973a84758ef4012bac (diff) | |
download | gitlab-ce-8b2a2fc5b0436b0f8e49a5f77b00c7dfbd3e7929.tar.gz |
Merge branch 'issue_12758_2' into 'master'
Add notification_settings:events to schema
See merge request !4800
-rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 4c1eb8cc1b3..29f90c47848 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: 20160616103948) do +ActiveRecord::Schema.define(version: 20160617301627) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -708,6 +708,7 @@ ActiveRecord::Schema.define(version: 20160616103948) do t.integer "level", default: 0, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.text "events" end add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree |