From 44535f9375ef6335551b0c9640ddad5b9d6de1c9 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Mon, 30 Mar 2015 15:53:24 -0700
Subject: upgrade hipchat

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 465e90e71a3..52e8a3f5a60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ gem "redis-rails"
 gem 'tinder', '~> 1.9.2'
 
 # HipChat integration
-gem "hipchat", "~> 1.4.0"
+gem 'hipchat', '~> 1.5.0'
 
 # Flowdock integration
 gem "gitlab-flowdock-git-hook", "~> 0.4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 747dbe1b037..29457552eb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,8 +271,9 @@ GEM
     hashie (2.1.2)
     highline (1.6.21)
     hike (1.2.3)
-    hipchat (1.4.0)
+    hipchat (1.5.0)
       httparty
+      mimemagic
     hitimes (1.2.2)
     html-pipeline (1.11.0)
       activesupport (>= 2)
@@ -284,7 +285,7 @@ GEM
       mime-types
       sanitize (~> 2.1)
     http_parser.rb (0.5.3)
-    httparty (0.13.0)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.1)
@@ -329,6 +330,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.3.0)
     mini_portile (0.6.1)
     minitest (5.3.5)
     mousetrap-rails (1.4.6)
@@ -714,7 +716,7 @@ DEPENDENCIES
   guard-rspec
   guard-spinach
   haml-rails
-  hipchat (~> 1.4.0)
+  hipchat (~> 1.5.0)
   html-pipeline-gitlab (~> 0.1)
   httparty
   jasmine (= 2.0.2)
-- 
cgit v1.2.1