Commit 0ef2fcde authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Merge pull request #9059 from chulkilee/fix-hipchat

do not send empty message to hipchat
parents d7f61aff 681fb7de
...@@ -11,6 +11,7 @@ v 7.11.0 (unreleased) ...@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
- -
- -
- Improve new project command options (Ben Bodenmiller) - Improve new project command options (Ben Bodenmiller)
- Prevent sending empty messages to HipChat (Chulki Lee)
v 7.10.0 (unreleased) v 7.10.0 (unreleased)
- Ignore submodules that are defined in .gitmodules but are checked in as directories. - Ignore submodules that are defined in .gitmodules but are checked in as directories.
......
...@@ -50,8 +50,9 @@ class HipchatService < Service ...@@ -50,8 +50,9 @@ class HipchatService < Service
def execute(data) def execute(data)
return unless supported_events.include?(data[:object_kind]) return unless supported_events.include?(data[:object_kind])
message = create_message(data)
gate[room].send('GitLab', create_message(data)) return unless message.present?
gate[room].send('GitLab', message)
end end
private private
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment