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 | |
| 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')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -118,9 +118,9 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 2.0' +gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 0.5' +gem 'fog-google', '~> 1.3.3' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' |