Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 with 12 additions and 10 deletions.
  1. +6 −5 lib/hipchat.rb
  2. +6 −5 lib/hipchat/rails3_tasks.rb
11 lib/hipchat.rb
View
@@ -71,11 +71,12 @@ def send(from, message, options_or_notify = {})
response = self.class.post('/message',
:query => { :auth_token => @token },
:body => {
- :room_id => room_id,
- :from => from,
- :message => message,
- :color => options[:color],
- :notify => options[:notify] ? 1 : 0
+ :room_id => room_id,
+ :from => from,
+ :message => message,
+ :message_format => options[:message_format] || 'html',
+ :color => options[:color],
+ :notify => options[:notify] ? 1 : 0
}
)
11 lib/hipchat/rails3_tasks.rb
View
@@ -7,11 +7,12 @@
config_file = Rails.root.join 'config', 'hipchat.yml'
options = {
- :message => ENV['MESSAGE'],
- :user => ENV['HIPCHAT_USER'],
- :notify => ENV['NOTIFY'],
- :room => ENV['ROOM'],
- :token => ENV['TOKEN']
+ :message => ENV['MESSAGE'],
+ :message_format => ENV['MESSAGE_FORMAT'],
+ :user => ENV['HIPCHAT_USER'],
+ :notify => ENV['NOTIFY'],
+ :room => ENV['ROOM'],
+ :token => ENV['TOKEN']
}.reject { |k, v| v.blank? }
system_options = {
Please sign in to comment.
Something went wrong with that request. Please try again.