diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-16 15:05:32 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-05 08:33:25 -0700 |
| commit | ae7be40f2596c31646318468a9ece210d77c3b58 (patch) | |
| tree | 43fad3c327b8a788f2fea0bfafd6985f8419dd5d | |
| parent | b5a06c609915a5321a5f35b7915dbb6744a54285 (diff) | |
| download | gitlab-ce-sh-filter-csrf-params.tar.gz | |
Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiessh-filter-csrf-params
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-- | 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 cba30e856ed..55653e72c24 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 |