Commit 193f9050 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 2c4eef58 5e9d4a08
......@@ -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.
......
......@@ -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
......
......@@ -9,5 +9,5 @@
%div
.md-write-holder
= yield
.md-preview-holder.hide
.md.md-preview-holder.hide
.js-md-preview{class: (preview_class if defined?(preview_class))}
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