Download as
Browse Code »

Commit 12dbd0a4137546026a7a1f606510627f262d6dc0

Authored by Dmitriy Zaporozhets
2 parents 3ce3c305 5499d216
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #5735 from cocoy/fix_5313 

Fix #5313 hipchat 0.14.0 to use http_proxy
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
@@ -120,7 +120,7 @@ gem "redis-rails" @@ -120,7 +120,7 @@ gem "redis-rails"
120 gem 'tinder', '~> 1.9.2' 120 gem 'tinder', '~> 1.9.2'
121 121
122 # HipChat integration 122 # HipChat integration
123 -gem "hipchat", "~> 0.9.0" 123 +gem "hipchat", "~> 0.14.0"
124 124
125 # Flowdock integration 125 # Flowdock integration
126 gem "gitlab-flowdock-git-hook", "~> 0.4.2" 126 gem "gitlab-flowdock-git-hook", "~> 0.4.2"
@@ -241,7 +241,7 @@ GEM @@ -241,7 +241,7 @@ GEM
241 railties (~> 4.0.0) 241 railties (~> 4.0.0)
242 hashie (2.0.5) 242 hashie (2.0.5)
243 hike (1.2.3) 243 hike (1.2.3)
244 - hipchat (0.9.0) 244 + hipchat (0.14.0)
245 httparty 245 httparty
246 httparty 246 httparty
247 http_parser.rb (0.5.3) 247 http_parser.rb (0.5.3)
@@ -604,7 +604,7 @@ DEPENDENCIES @@ -604,7 +604,7 @@ DEPENDENCIES
604 guard-rspec 604 guard-rspec
605 guard-spinach 605 guard-spinach
606 haml-rails 606 haml-rails
607 - hipchat (~> 0.9.0) 607 + hipchat (~> 0.14.0)
608 httparty 608 httparty
609 jasmine (= 2.0.0.rc5) 609 jasmine (= 2.0.0.rc5)
610 jquery-atwho-rails (~> 0.3.3) 610 jquery-atwho-rails (~> 0.3.3)