diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-12 16:10:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 16:10:58 +0100 |
| commit | c1befd3909359e4d964da74bde9931a8416d26a3 (patch) | |
| tree | 7eb7528245c671cdf908e07c3d630e7639d575bb /Gemfile | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
| parent | be4849c08306cce930ea27e1f8097ffb774f75c6 (diff) | |
Merge pull request #1252 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 4d6d3aec0..c1bfe78dd 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.4' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.57', require: false +gem 'aws-sdk-s3', '~> 1.59', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -89,7 +89,7 @@ gem 'simple-navigation', '~> 4.1' gem 'simple_form', '~> 5.0' gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' gem 'stoplight', '~> 2.2.0' -gem 'strong_migrations', '~> 0.4' +gem 'strong_migrations', '~> 0.5' gem 'tty-command', '~> 0.9', require: false gem 'tty-prompt', '~> 0.20', require: false gem 'twitter-text', '~> 1.14' |