diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-16 16:59:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-16 16:59:34 +0000 |
| commit | 6f0358107dda89aea1de3c5ce83012d56797c32e (patch) | |
| tree | e65f94bd05d7f9f52f1245553ec1a3e4a80c96ef | |
| parent | 9498c4d52a3e6533da6e41443041edfbd042333f (diff) | |
| parent | 0f3afca309f16049e951b7044a88eb0366641e96 (diff) | |
| download | gitlab-ce-6f0358107dda89aea1de3c5ce83012d56797c32e.tar.gz | |
Merge branch 'bump-fog-aws' into 'master'
Bump fog-aws and other dependent modules
fog-aws CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md
Notable improvements:
* Support for ap-south-1 region
* Fix for empty ETag values
Closes #22260
See merge request !6392
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 950a44acc47..20948a8db5e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.12.0 (unreleased) - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251 - Only check :can_resolve permission if the note is resolvable + - Bump fog-aws to v0.11.0 to support ap-south-1 region - Add ability to fork to a specific namespace using API. (ritave) - Cleanup misalignments in Issue list view !6206 - Prune events older than 12 months. (ritave) diff --git a/Gemfile.lock b/Gemfile.lock index 1edb218373d..6fe761fe0b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM erubis (2.7.0) escape_utils (1.1.1) eventmachine (1.0.8) - excon (0.49.0) + excon (0.52.0) execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.5.0) @@ -215,8 +215,8 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.11.0) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -225,7 +225,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) |