diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 06:08:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 06:08:54 +0000 |
| commit | a552864a355f31c496e476ad4e57585aeab95a12 (patch) | |
| tree | 4f64140ae93033e7b8e7ee683666d506eca41b68 /Gemfile.lock | |
| parent | 4998f4e2d82409aaebb4a0fb6f85ad130819da57 (diff) | |
| download | gitlab-ce-a552864a355f31c496e476ad4e57585aeab95a12.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2a94b907417..2c24085a34c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,13 +81,15 @@ GEM attr_required (1.0.1) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-sdk (2.11.374) - aws-sdk-resources (= 2.11.374) - aws-sdk-core (2.11.374) - aws-sigv4 (~> 1.0) + aws-partitions (1.263.0) + aws-sdk-cloudformation (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.88.0) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-resources (2.11.374) - aws-sdk-core (= 2.11.374) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) @@ -276,9 +278,9 @@ GEM faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-signers-v4 (0.1.7) - aws-sdk-resources (~> 2) - faraday (~> 0.9) + faraday_middleware-aws-sigv4 (0.3.0) + aws-sigv4 (~> 1.0) + faraday (>= 0.15) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -1141,7 +1143,8 @@ DEPENDENCIES atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk + aws-sdk-cloudformation (~> 1) + aws-sdk-core (~> 3) babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) @@ -1187,7 +1190,7 @@ DEPENDENCIES escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) - faraday_middleware-aws-signers-v4 + faraday_middleware-aws-sigv4 fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) |