diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-29 18:27:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 18:27:34 +0200 |
| commit | 54ed35f57c55fff639c8192b99fc60ab69c54f06 (patch) | |
| tree | 78cee27bfe871569f3ae2e7aa62d847fe9df7046 /Gemfile.lock | |
| parent | 63f79874b59b3ba28c0f940b9d36ea7aacb44c93 (diff) | |
| parent | 485b43ed7e312ab2c3bad446132c57d6a0ce7de4 (diff) | |
Merge pull request #1801 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8c02b4244..52382b554 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,6 +163,7 @@ GEM elasticsearch-dsl chunky_png (1.4.0) climate_control (0.2.0) + cocoon (1.2.15) coderay (1.1.3) color_diff (0.1) concurrent-ruby (1.1.10) @@ -293,12 +294,12 @@ GEM hkdf (0.3.0) html_tokenizer (0.0.7) htmlentities (4.3.4) - http (5.0.4) + http (5.1.0) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) llhttp-ffi (~> 0.4.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http_accept_language (2.1.1) @@ -448,7 +449,7 @@ GEM parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) - pg (1.3.5) + pg (1.4.0) pghero (2.8.3) activerecord (>= 5) pkg-config (1.4.7) @@ -679,7 +680,7 @@ GEM tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) unicode-display_width (2.1.0) uniform_notifier (1.16.0) validate_email (0.1.6) @@ -749,6 +750,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.7) chewy (~> 7.2) climate_control (~> 0.2) + cocoon (~> 1.2) color_diff (~> 0.1) concurrent-ruby connection_pool @@ -771,7 +773,7 @@ DEPENDENCIES hcaptcha (~> 7.1) hiredis (~> 0.6) htmlentities (~> 4.3) - http (~> 5.0) + http (~> 5.1) http_accept_language (~> 2.1) httplog (~> 1.5.0) i18n-tasks (~> 1.0) @@ -799,7 +801,7 @@ DEPENDENCIES omniauth-saml (~> 1.10) ox (~> 2.14) parslet - pg (~> 1.3) + pg (~> 1.4) pghero (~> 2.8) pkg-config (~> 1.4) posix-spawn |