diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-14 20:12:47 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-14 20:12:47 +0300 |
| commit | 4063f35f00bea4b2fc26640db385abb4e72043bd (patch) | |
| tree | 6f8020fe89c537d1fc4b45a09eb3b4e3d4d7b138 /Gemfile | |
| parent | 9be9328bc2a9e9da71d77a1fbcf76336e89e53f1 (diff) | |
| parent | 867890658b1018eb5777bd0af8a7be7b673a865c (diff) | |
Merge branch 'update-fog-aws' into 'master'
update fog-aws 1.4 -> 2.0
See merge request gitlab-org/gitlab-ce!17708
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -104,7 +104,7 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 1.4' +gem 'fog-aws', '~> 2.0' gem 'fog-core', '~> 1.44' gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' |