diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-22 08:36:27 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-22 08:36:27 +0200 |
| commit | 0ef2fcde244c24ed472247113507d29d075f7ae8 (patch) | |
| tree | 63d1ea760c6300c1897e1af0c33913264b0986ac | |
| parent | d7f61affaf845f44b4cc995e34eb1606c47c8eff (diff) | |
| parent | 681fb7def6cc53de1751dd4085177964d3d1f6a3 (diff) | |
| download | gitlab-ce-0ef2fcde244c24ed472247113507d29d075f7ae8.tar.gz | |
Merge pull request #9059 from chulkilee/fix-hipchat
do not send empty message to hipchat
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 55081988071..fa8ecbd8c74 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 7.11.0 (unreleased) - - - Improve new project command options (Ben Bodenmiller) + - Prevent sending empty messages to HipChat (Chulki Lee) v 7.10.0 (unreleased) - Ignore submodules that are defined in .gitmodules but are checked in as directories. diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index d264a56ebdf..07520eab5d1 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -50,8 +50,9 @@ class HipchatService < Service def execute(data) return unless supported_events.include?(data[:object_kind]) - - gate[room].send('GitLab', create_message(data)) + message = create_message(data) + return unless message.present? + gate[room].send('GitLab', message) end private |