diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 18:07:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 18:07:20 +0300 |
commit | dee9315801b5dc49b795d13081086c22622a11ec (patch) | |
tree | 9582ec7c9aa89cee317b3c6398aac4e07897414a /Gemfile.lock | |
parent | d64e3a8b281d355c7d51d04df52fab407b8cc76d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9ba2c0b5a31..ecc68463f89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,14 +80,16 @@ GEM encryptor (~> 3.0.0) attr_required (1.0.1) awesome_print (1.8.0) - aws-sdk (2.9.32) - aws-sdk-resources (= 2.9.32) - aws-sdk-core (2.9.32) + 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) jmespath (~> 1.0) - aws-sdk-resources (2.9.32) - aws-sdk-core (= 2.9.32) - aws-sigv4 (1.0.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) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -506,7 +508,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.3.1) + jmespath (1.4.0) js_regex (3.1.1) character_set (~> 1.1) regexp_parser (~> 1.1) |