summaryrefslogtreecommitdiff
path: root/Gemfile
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 /Gemfile
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 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'