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 | |
| 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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-jira-gem.yml | 5 |
3 files changed, 9 insertions, 3 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' 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 |