diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-10 14:11:29 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-10 14:11:29 -0800 |
| commit | 12dbd0a4137546026a7a1f606510627f262d6dc0 (patch) | |
| tree | 5d6ac56bbbe3c39943da1a1e5a5a7c94cec844e7 | |
| parent | 3ce3c305ebac1ae076a2e51df77f7f0ee4034d67 (diff) | |
| parent | 5499d2163f639d07d043e21236b9088471436cb6 (diff) | |
| download | gitlab-ce-12dbd0a4137546026a7a1f606510627f262d6dc0.tar.gz | |
Merge pull request #5735 from cocoy/fix_5313
Fix #5313 hipchat 0.14.0 to use http_proxy
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -120,7 +120,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 75083623894..2e95792aaf2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -241,7 +241,7 @@ GEM railties (~> 4.0.0) hashie (2.0.5) hike (1.2.3) - hipchat (0.9.0) + hipchat (0.14.0) httparty httparty http_parser.rb (0.5.3) @@ -604,7 +604,7 @@ DEPENDENCIES guard-rspec guard-spinach haml-rails - hipchat (~> 0.9.0) + hipchat (~> 0.14.0) httparty jasmine (= 2.0.0.rc5) jquery-atwho-rails (~> 0.3.3) |