diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-06 16:21:23 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-06 16:21:23 +0000 |
commit | 76802012e62a70bd040ec5cb8efa7e357dda0eee (patch) | |
tree | a0d85dcfb27c34aaede8c7183c9482248d6bee7f /db/schema.rb | |
parent | 8b53d9efe648f10e0572c2d8017489d0d3bb4755 (diff) | |
parent | 7e204cf389346d23e71bc4c2fa9e14cf82a7ed2e (diff) | |
download | gitlab-ce-76802012e62a70bd040ec5cb8efa7e357dda0eee.tar.gz |
Merge branch 'add-notes-notifications-to-services' into 'master'
Add notes notifications to services
This merge request builds on top of a few other merge requests:
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/350
The purpose of this merge request is to add service notification support when a user comments on one of the following:
* commits
* issues
* merge requests
* code snippets
Currently HipChat and Slack are only supported. The admin can select which events to toggle on or off.
## Questions
All note events are bundled under the `note` event type. Is this okay, or does it make more sense to have individual events and/or change the `object_type` attribute in the hook data?
Also, does it look better to link the entire `merge request #X` as opposed to just `#X`? I like the former.
## Before

## After

### Slack

### HipChat

See merge request !358
Diffstat (limited to 'db/schema.rb')
-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 1a9b512e159..a686bb4b3cd 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: 20150223022001) do +ActiveRecord::Schema.define(version: 20150225065047) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -371,6 +371,7 @@ ActiveRecord::Schema.define(version: 20150223022001) do t.boolean "issues_events", default: true t.boolean "merge_requests_events", default: true t.boolean "tag_push_events", default: true + t.boolean "note_events", default: true, null: false end add_index "services", ["created_at", "id"], name: "index_services_on_created_at_and_id", using: :btree |