diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-04-22 11:17:01 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-04-22 11:17:01 +0200 |
| commit | 193f905072e81615dbbea2357874878d697fefb6 (patch) | |
| tree | 31335aff3cd8b30b5b7ceac1defe6d6494fdae79 | |
| parent | 2c4eef589923ca6228c941f32feec7b56302c0ee (diff) | |
| parent | 5e9d4a08a5ccf0e381c520e7cfd059c7b9eb6a20 (diff) | |
| download | gitlab-ce-193f905072e81615dbbea2357874878d697fefb6.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 2 |
3 files changed, 5 insertions, 3 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 diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index f356a25dbfa..b869fd6e12a 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -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))} |