diff options
author | Rémy Coutable <remy@rymai.me> | 2017-01-23 13:52:57 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-01-23 13:52:57 +0300 |
commit | 3a54128d1f1ac1fa0779fe7309bd043ffa947ab5 (patch) | |
tree | c29e0479dd8f6a2ac316a32253c6708aa0bba50c | |
parent | 8a6e415268c60074b8cd9508c106120107ce5731 (diff) | |
parent | 607b3c4892578020bd0f7dcd669fd4fc68430cfc (diff) |
Merge branch 'zj-mattermost-fixes' into 'master'
Mattermost fixes
See merge request !8654
-rw-r--r-- | app/models/project_services/chat_notification_service.rb | 14 | ||||
-rw-r--r-- | app/models/project_services/mattermost_service.rb | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb index b7ef44c3054..3098625b0c2 100644 --- a/app/models/project_services/chat_notification_service.rb +++ b/app/models/project_services/chat_notification_service.rb @@ -82,19 +82,19 @@ class ChatNotificationService < Service def get_message(object_kind, data) case object_kind when "push", "tag_push" - PushMessage.new(data) + ChatMessage::PushMessage.new(data) when "issue" - IssueMessage.new(data) unless is_update?(data) + ChatMessage::IssueMessage.new(data) unless is_update?(data) when "merge_request" - MergeMessage.new(data) unless is_update?(data) + ChatMessage::MergeMessage.new(data) unless is_update?(data) when "note" - NoteMessage.new(data) + ChatMessage::NoteMessage.new(data) when "build" - BuildMessage.new(data) if should_build_be_notified?(data) + ChatMessage::BuildMessage.new(data) if should_build_be_notified?(data) when "pipeline" - PipelineMessage.new(data) if should_pipeline_be_notified?(data) + ChatMessage::PipelineMessage.new(data) if should_pipeline_be_notified?(data) when "wiki_page" - WikiPageMessage.new(data) + ChatMessage::WikiPageMessage.new(data) end end diff --git a/app/models/project_services/mattermost_service.rb b/app/models/project_services/mattermost_service.rb index ee8a0b55275..2bea3827b95 100644 --- a/app/models/project_services/mattermost_service.rb +++ b/app/models/project_services/mattermost_service.rb @@ -36,6 +36,6 @@ class MattermostService < ChatNotificationService end def default_channel_placeholder - "#town-square" + "town-square" end end |