diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-28 10:57:29 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-28 10:57:29 +0300 |
| commit | 949d1b37e740ae28e1a3eaf41ce10388617385d6 (patch) | |
| tree | c831e1c5b28a4b7704ee26d533cdf03d731a9cbb /Gemfile.lock | |
| parent | 092445a4025bc1033e2028655ba739961f5e4ebb (diff) | |
| parent | 04c5e637f827d869f8bbfb21ca41eb552c3324d6 (diff) | |
Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'
LFS direct upload port to CE
Closes #44548
See merge request gitlab-org/gitlab-ce!17752
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 fcffe45acbf..d50b3b1857a 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) @@ -1047,9 +1048,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) |