Skip to content
This repository
Browse code

Merge branch 'master' of git://github.com/NewAlexandria/hipchat into …

…NewAlexandria-master
  • Loading branch information...
commit 84a56f3729eaa6f36c0a803f35c99bd9d19d5a66 2 parents 4456ac0 + ae54a2f
Zuhaib Siddique zsiddique authored

Showing 2 changed files with 12 additions and 10 deletions. Show diff stats Hide diff stats

  1. +6 5 lib/hipchat.rb
  2. +6 5 lib/hipchat/rails3_tasks.rb
11 lib/hipchat.rb
@@ -71,11 +71,12 @@ def send(from, message, options_or_notify = {})
71 71 response = self.class.post('/message',
72 72 :query => { :auth_token => @token },
73 73 :body => {
74   - :room_id => room_id,
75   - :from => from,
76   - :message => message,
77   - :color => options[:color],
78   - :notify => options[:notify] ? 1 : 0
  74 + :room_id => room_id,
  75 + :from => from,
  76 + :message => message,
  77 + :message_format => options[:message_format] || 'html',
  78 + :color => options[:color],
  79 + :notify => options[:notify] ? 1 : 0
79 80 }
80 81 )
81 82
11 lib/hipchat/rails3_tasks.rb
@@ -7,11 +7,12 @@
7 7 config_file = Rails.root.join 'config', 'hipchat.yml'
8 8
9 9 options = {
10   - :message => ENV['MESSAGE'],
11   - :user => ENV['HIPCHAT_USER'],
12   - :notify => ENV['NOTIFY'],
13   - :room => ENV['ROOM'],
14   - :token => ENV['TOKEN']
  10 + :message => ENV['MESSAGE'],
  11 + :message_format => ENV['MESSAGE_FORMAT'],
  12 + :user => ENV['HIPCHAT_USER'],
  13 + :notify => ENV['NOTIFY'],
  14 + :room => ENV['ROOM'],
  15 + :token => ENV['TOKEN']
15 16 }.reject { |k, v| v.blank? }
16 17
17 18 system_options = {

0 comments on commit 84a56f3

Please sign in to comment.
Something went wrong with that request. Please try again.