summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-09-05 19:16:20 +0000
committerRobert Speicher <robert@gitlab.com>2017-09-05 19:16:20 +0000
commitb8b4993805c620f6c29f3189b6e151c47854c5b7 (patch)
tree95020feb81cbf63914a4cb52d471fa904c4e03c2
parent685066cd0e4bb9c2279c1ed43ae445d07c963743 (diff)
parent7f012213ad60581fd319aaa0f3c0b5eb0cc4ae61 (diff)
downloadgitlab-ce-b8b4993805c620f6c29f3189b6e151c47854c5b7.tar.gz
Merge branch 'sh-bump-jira-gem' into 'master'
Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies Closes gitlab-ee#3125 See merge request !13617
-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 be3f75df7da..0341f2609ad 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 5761495dddc..320d42b8974 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