diff options
author | Robert Speicher <robert@gitlab.com> | 2017-09-05 19:16:20 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-09-05 19:16:20 +0000 |
commit | b8b4993805c620f6c29f3189b6e151c47854c5b7 (patch) | |
tree | 95020feb81cbf63914a4cb52d471fa904c4e03c2 /Gemfile | |
parent | 685066cd0e4bb9c2279c1ed43ae445d07c963743 (diff) | |
parent | 7f012213ad60581fd319aaa0f3c0b5eb0cc4ae61 (diff) | |
download | gitlab-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-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |