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 /app/models/snippet.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 'app/models/snippet.rb')
-rw-r--r-- | app/models/snippet.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 82c1ab94446..3fb2ec1d66c 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -59,6 +59,10 @@ class Snippet < ActiveRecord::Base content end + def hook_attrs + attributes + end + def size 0 end |