diff options
author | ThibG <thib@sitedethib.com> | 2020-11-04 14:52:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 14:52:19 +0100 |
commit | 1f69ad798d9a42d8ec3df69ded7625524c5eb67c (patch) | |
tree | a8e0759e3f13bf13dabbb8a261cd1bdb2f3e1e1a /Gemfile.lock | |
parent | b8e790c3c22693271a4fd74ce34067c462ebf8a3 (diff) | |
parent | dc86d814d93b9bb564ab35728c6d9fb65d064ca3 (diff) |
Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0b40ff4eb..a990db227 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM cocaine (~> 0.5.3) awrence (1.1.1) aws-eventstream (1.1.0) - aws-partitions (1.380.0) + aws-partitions (1.385.0) aws-sdk-core (3.109.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -88,7 +88,7 @@ GEM aws-sdk-kms (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.0) + aws-sdk-s3 (1.83.1) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -583,7 +583,7 @@ GEM simple_form (5.0.3) actionpack (>= 5.0) activemodel (>= 5.0) - simplecov (0.19.0) + simplecov (0.19.1) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) @@ -597,12 +597,12 @@ GEM sshkit (1.21.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stackprof (0.2.15) + stackprof (0.2.16) statsd-ruby (1.4.0) stoplight (2.2.1) streamio-ffmpeg (3.0.2) multi_json (~> 1.8) - strong_migrations (0.7.1) + strong_migrations (0.7.2) activerecord (>= 5) temple (0.8.2) terminal-table (1.8.0) @@ -631,7 +631,7 @@ GEM unf (~> 0.1.0) tzinfo (1.2.7) thread_safe (~> 0.1) - tzinfo-data (1.2020.3) + tzinfo-data (1.2020.4) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext |