diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 16:46:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-27 16:46:38 +0100 |
commit | e2933854ac598c5ee7428a654a72cf4f4bd9afea (patch) | |
tree | b477529aea467279c73b35c87124d7355861646a /Gemfile.lock | |
parent | 3b9a6049adf3ee6844a81622c297dd893836f79d (diff) | |
parent | f011787003bcb801b487ad3f5229e324a37c9e1d (diff) |
Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0d195e5b2..3729e532c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,16 +79,16 @@ GEM encryptor (~> 3.0.0) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.534.0) - aws-sdk-core (3.123.0) + aws-partitions (1.539.0) + aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.51.0) + aws-sdk-kms (1.52.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.107.0) + aws-sdk-s3 (1.109.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -106,13 +106,13 @@ GEM ffi (~> 1.14) bootsnap (1.9.3) msgpack (~> 1.0) - brakeman (5.1.2) + brakeman (5.2.0) browser (4.2.0) brpoplpush-redis_script (0.1.2) concurrent-ruby (~> 1.0, >= 1.0.5) redis (>= 1.0, <= 5.0) builder (3.2.4) - bullet (6.1.5) + bullet (7.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.9.0.1) @@ -168,7 +168,7 @@ GEM css_parser (1.7.1) addressable debug_inspector (1.0.0) - devise (4.8.0) + devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -184,8 +184,8 @@ GEM devise (>= 4.0.0) rpam2 (~> 4.0) diff-lcs (1.4.4) - discard (1.2.0) - activerecord (>= 4.2, < 7) + discard (1.2.1) + activerecord (>= 4.2, < 8) docile (1.3.4) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -211,7 +211,7 @@ GEM et-orbi (1.2.4) tzinfo excon (0.76.0) - fabrication (2.22.0) + fabrication (2.23.1) faker (2.19.0) i18n (>= 1.6, < 2) faraday (1.8.0) @@ -234,7 +234,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) fast_blank (1.0.1) - fastimage (2.2.5) + fastimage (2.2.6) ffi (1.15.4) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -355,7 +355,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -376,7 +376,7 @@ GEM mime-types-data (3.2021.1115) mini_mime (1.1.2) mini_portile2 (2.6.1) - minitest (5.14.4) + minitest (5.15.0) msgpack (1.4.2) multi_json (1.15.0) multipart-post (2.1.1) @@ -393,7 +393,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.13.9) + oj (3.13.10) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -418,7 +418,7 @@ GEM pastel (0.8.0) tty-color (~> 0.5) pg (1.2.3) - pghero (2.8.1) + pghero (2.8.2) activerecord (>= 5) pkg-config (1.4.6) posix-spawn (0.3.15) @@ -580,7 +580,7 @@ GEM sidekiq (>= 3) thwait tilt (>= 1.4.0) - sidekiq-unique-jobs (7.1.8) + sidekiq-unique-jobs (7.1.12) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) sidekiq (>= 5.0, < 8.0) @@ -599,7 +599,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.1) + sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) @@ -609,7 +609,7 @@ GEM stackprof (0.2.17) statsd-ruby (1.5.0) stoplight (2.2.1) - strong_migrations (0.7.8) + strong_migrations (0.7.9) activerecord (>= 5) temple (0.8.2) terminal-table (3.0.2) @@ -686,14 +686,14 @@ DEPENDENCIES active_record_query_trace (~> 1.8) addressable (~> 2.8) annotate (~> 3.1) - aws-sdk-s3 (~> 1.107) + aws-sdk-s3 (~> 1.109) better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) bootsnap (~> 1.9.2) - brakeman (~> 5.1) + brakeman (~> 5.2) browser - bullet (~> 6.1) + bullet (~> 7.0) bundler-audit (~> 0.9) capistrano (~> 3.16) capistrano-rails (~> 1.6) @@ -714,7 +714,7 @@ DEPENDENCIES doorkeeper (~> 5.5) dotenv-rails (~> 2.7) ed25519 (~> 1.2) - fabrication (~> 2.22) + fabrication (~> 2.23) faker (~> 2.19) fast_blank (~> 1.0) fastimage |