diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-03-23 11:07:22 +0100 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-03-27 10:32:48 +0200 |
| commit | 04c5e637f827d869f8bbfb21ca41eb552c3324d6 (patch) | |
| tree | 72c21a6a623dba819cfbcdd45a25d43832b27124 /Gemfile.lock | |
| parent | ffa73498b1c3125eec6d51db4502ab22da664773 (diff) | |
| download | gitlab-ce-04c5e637f827d869f8bbfb21ca41eb552c3324d6.tar.gz | |
Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 61107a2130b..47466779341 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -244,10 +244,11 @@ GEM builder excon (~> 0.58) formatador (~> 0.2) - fog-google (0.5.3) + fog-google (1.3.3) fog-core fog-json fog-xml + google-api-client (~> 0.19.1) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -1044,9 +1045,9 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0) + fog-aws (~> 2.0.1) fog-core (~> 1.44) - fog-google (~> 0.5) + fog-google (~> 1.3.3) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) |