Download as
Browse Code »

Commit 5499d2163f639d07d043e21236b9088471436cb6

Authored by Rodney Quillo
1 parent 477e9f87
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix #5313 hipchat 0.14.0 to use http_proxy

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @5499d21
... ... @@ -110,7 +110,7 @@ gem "redis-rails"
110 110 gem 'tinder', '~> 1.9.2'
111 111  
112 112 # HipChat integration
113   -gem "hipchat", "~> 0.9.0"
  113 +gem "hipchat", "~> 0.14.0"
114 114  
115 115 # Flowdock integration
116 116 gem "gitlab-flowdock-git-hook", "~> 0.4.2"
... ...
Gemfile.lock
  Diff comments   View file @5499d21
... ... @@ -227,7 +227,7 @@ GEM
227 227 railties (>= 3.1, < 4.1)
228 228 hashie (1.2.0)
229 229 hike (1.2.3)
230   - hipchat (0.9.0)
  230 + hipchat (0.14.0)
231 231 httparty
232 232 httparty
233 233 http_parser.rb (0.5.3)
... ... @@ -588,7 +588,7 @@ DEPENDENCIES
588 588 guard-rspec
589 589 guard-spinach
590 590 haml-rails
591   - hipchat (~> 0.9.0)
  591 + hipchat (~> 0.14.0)
592 592 httparty
593 593 jasmine
594 594 jquery-atwho-rails (= 0.3.0)
... ...