diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-07 16:47:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 16:47:02 +0100 |
| commit | 9871466958a5db6c4b75cab120eb6ca706c26d7e (patch) | |
| tree | 56b830794b3b9ead38291e20c9197ebb3095694d /Gemfile | |
| parent | bcfd6e3bb48f6e0eb88f7f3a650832842ab69166 (diff) | |
| parent | 5636c94fe911f670a0f51d63c915c722daf24df5 (diff) | |
Merge pull request #1261 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile index a0ad8e464..7e409ffa1 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.4' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.59', require: false +gem 'aws-sdk-s3', '~> 1.60', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -118,7 +118,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.29' + gem 'capybara', '~> 3.30' gem 'climate_control', '~> 0.2' gem 'faker', '~> 2.10' gem 'microformats', '~> 4.2' @@ -134,7 +134,7 @@ group :development do gem 'annotate', '~> 3.0' gem 'better_errors', '~> 2.5' gem 'binding_of_caller', '~> 0.7' - gem 'bullet', '~> 6.0' + gem 'bullet', '~> 6.1' gem 'letter_opener', '~> 1.7' gem 'letter_opener_web', '~> 1.3' gem 'memory_profiler' |