Commit 5499d216 authored by Rodney Quillo's avatar Rodney Quillo

Fix #5313 hipchat 0.14.0 to use http_proxy

parent 477e9f87
...@@ -110,7 +110,7 @@ gem "redis-rails" ...@@ -110,7 +110,7 @@ gem "redis-rails"
gem 'tinder', '~> 1.9.2' gem 'tinder', '~> 1.9.2'
# HipChat integration # HipChat integration
gem "hipchat", "~> 0.9.0" gem "hipchat", "~> 0.14.0"
# Flowdock integration # Flowdock integration
gem "gitlab-flowdock-git-hook", "~> 0.4.2" gem "gitlab-flowdock-git-hook", "~> 0.4.2"
......
...@@ -227,7 +227,7 @@ GEM ...@@ -227,7 +227,7 @@ GEM
railties (>= 3.1, < 4.1) railties (>= 3.1, < 4.1)
hashie (1.2.0) hashie (1.2.0)
hike (1.2.3) hike (1.2.3)
hipchat (0.9.0) hipchat (0.14.0)
httparty httparty
httparty httparty
http_parser.rb (0.5.3) http_parser.rb (0.5.3)
...@@ -588,7 +588,7 @@ DEPENDENCIES ...@@ -588,7 +588,7 @@ DEPENDENCIES
guard-rspec guard-rspec
guard-spinach guard-spinach
haml-rails haml-rails
hipchat (~> 0.9.0) hipchat (~> 0.14.0)
httparty httparty
jasmine jasmine
jquery-atwho-rails (= 0.3.0) jquery-atwho-rails (= 0.3.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment