From 7f012213ad60581fd319aaa0f3c0b5eb0cc4ae61 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 16 Aug 2017 15:05:32 -0700
Subject: [PATCH] Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies

Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP
proxy were confused via the `http_proxy` environment variables:
https://github.com/sumoheavy/jira-ruby/issues/250

Closes gitlab-org/gitlab-ee#3125
---
 Gemfile                                    | 2 +-
 Gemfile.lock                               | 5 +++--
 changelogs/unreleased/sh-bump-jira-gem.yml | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/sh-bump-jira-gem.yml

diff --git a/Gemfile b/Gemfile
index 61c941ae449..5b551005c6e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -181,7 +181,7 @@ gem 'connection_pool', '~> 2.0'
 gem 'hipchat', '~> 1.5.0'
 
 # JIRA integration
-gem 'jira-ruby', '~> 1.1.2'
+gem 'jira-ruby', '~> 1.4'
 
 # Flowdock integration
 gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index cba30e856ed..55653e72c24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,8 +404,9 @@ GEM
       cause
       json
     ipaddress (0.8.3)
-    jira-ruby (1.1.2)
+    jira-ruby (1.4.1)
       activesupport
+      multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jquery-atwho-rails (1.3.2)
     jquery-rails (4.1.1)
@@ -1042,7 +1043,7 @@ DEPENDENCIES
   html2text
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
-  jira-ruby (~> 1.1.2)
+  jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
   jquery-rails (~> 4.1.0)
   json-schema (~> 2.6.2)
diff --git a/changelogs/unreleased/sh-bump-jira-gem.yml b/changelogs/unreleased/sh-bump-jira-gem.yml
new file mode 100644
index 00000000000..d76b688caac
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-jira-gem.yml
@@ -0,0 +1,5 @@
+---
+title: Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies
+merge_request:
+author:
+type: fixed