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.lock | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
| parent | be4849c08306cce930ea27e1f8097ffb774f75c6 (diff) | |
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 091fc78c4..efdcee087 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,8 +105,8 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.3) - aws-partitions (1.246.0) - aws-sdk-core (3.82.0) + aws-partitions (1.251.0) + aws-sdk-core (3.84.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -114,8 +114,8 @@ GEM aws-sdk-kms (1.26.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.57.0) - aws-sdk-core (~> 3, >= 3.77.0) + aws-sdk-s3 (1.59.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -594,7 +594,7 @@ GEM rufus-scheduler (~> 3.2) sidekiq (>= 3) tilt (>= 1.4.0) - sidekiq-unique-jobs (6.0.15) + sidekiq-unique-jobs (6.0.18) concurrent-ruby (~> 1.0, >= 1.0.5) sidekiq (>= 4.0, < 7.0) thor (~> 0) @@ -623,7 +623,7 @@ GEM stoplight (2.2.0) streamio-ffmpeg (3.0.2) multi_json (~> 1.8) - strong_migrations (0.4.2) + strong_migrations (0.5.0) activerecord (>= 5) temple (0.8.1) terminal-table (1.8.0) @@ -685,7 +685,7 @@ DEPENDENCIES active_record_query_trace (~> 1.7) addressable (~> 2.7) annotate (~> 3.0) - aws-sdk-s3 (~> 1.57) + aws-sdk-s3 (~> 1.59) better_errors (~> 2.5) binding_of_caller (~> 0.7) blurhash (~> 0.1) @@ -798,7 +798,7 @@ DEPENDENCIES stackprof stoplight (~> 2.2.0) streamio-ffmpeg (~> 3.0) - strong_migrations (~> 0.4) + strong_migrations (~> 0.5) thor (~> 0.20) tty-command (~> 0.9) tty-prompt (~> 0.20) |