kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Marin Jankovski 2015-04-22 11:17:01 +02:00
commit 193f905072
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -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.

5
app/models/project_services/hipchat_service.rb
View file

@ -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

2
app/views/projects/_md_preview.html.haml
View file

@ -9,5 +9,5 @@
%div %div
.md-write-holder .md-write-holder
= yield = yield
.md-preview-holder.hide .md.md-preview-holder.hide
.js-md-preview{class: (preview_class if defined?(preview_class))} .js-md-preview{class: (preview_class if defined?(preview_class))}