diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-18 10:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 10:18:52 +0200 |
| commit | 4beb8d77889e4e152a483e4d17724fa83e7c0dd3 (patch) | |
| tree | f997699db29bb7e01d03d8ab93b9051ad50d2ef3 /Gemfile | |
| parent | 9ca21e93cc1506d0a3c0cfe450636933c3d2388a (diff) | |
| parent | 6e227ecb04ee59b36a47bff7be1f1639b0d9c8da (diff) | |
Merge pull request #1053 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 31cf743a4..6c7bef290 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.2' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.36', require: false +gem 'aws-sdk-s3', '~> 1.39', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -111,7 +111,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.19' + gem 'capybara', '~> 3.20' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.1' |