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 /Gemfile | |
| 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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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" |