summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-16 15:05:32 -0700
committerStan Hu <stanhu@gmail.com>2017-08-16 15:08:10 -0700
commit6fa6025a3862c71440b9bd4f2076c1cc9add2cdb (patch)
tree532d874ab347646a523aafed430b8a43b6278d8d
parentec34b2d051c16a351387fbaedb5542654810b8a5 (diff)
downloadgitlab-ce-sh-bump-jira-gem.tar.gz
Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiessh-bump-jira-gem
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
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
-rw-r--r--changelogs/unreleased/sh-bump-jira-gem.yml5
3 files changed, 9 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d10269d7aac..ba22a9fce8f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -186,7 +186,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 f7ad7bcbc6e..fef85799c9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -408,8 +408,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)
@@ -1047,7 +1048,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