From 5499d2163f639d07d043e21236b9088471436cb6 Mon Sep 17 00:00:00 2001
From: Rodney Quillo <imcocoy@gmail.com>
Date: Sat, 30 Nov 2013 19:31:26 +0800
Subject: [PATCH] Fix #5313 hipchat 0.14.0 to use http_proxy
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 198a76a29de..15397b387b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -110,7 +110,7 @@ gem "redis-rails"
gem 'tinder', '~> 1.9.2'
# HipChat integration
-gem "hipchat", "~> 0.9.0"
+gem "hipchat", "~> 0.14.0"
# Flowdock integration
gem "gitlab-flowdock-git-hook", "~> 0.4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index f6b9f174a08..c71b5b7807d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,7 +227,7 @@ GEM
railties (>= 3.1, < 4.1)
hashie (1.2.0)
hike (1.2.3)
- hipchat (0.9.0)
+ hipchat (0.14.0)
httparty
httparty
http_parser.rb (0.5.3)
@@ -588,7 +588,7 @@ DEPENDENCIES
guard-rspec
guard-spinach
haml-rails
- hipchat (~> 0.9.0)
+ hipchat (~> 0.14.0)
httparty
jasmine
jquery-atwho-rails (= 0.3.0)
--
GitLab