diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
commit | b2915613fb247597d3de2f80c2c007b3369ac5bb (patch) | |
tree | 745c245cb4c2d16dcada37d1fb1cf5b13f4e2493 /Gemfile.lock | |
parent | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (diff) | |
parent | e38fc319dc6897ca867a509b0c7a5878d34d0f00 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bf6b5474f..545032b2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -417,7 +417,7 @@ GEM parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) - pg (1.2.3) + pg (1.3.0) pghero (2.8.2) activerecord (>= 5) pkg-config (1.4.7) @@ -493,8 +493,8 @@ GEM rake (13.0.6) rdf (3.2.3) link_header (~> 0.0, >= 0.0.8) - rdf-normalize (0.4.0) - rdf (~> 3.1) + rdf-normalize (0.5.0) + rdf (~> 3.2) redcarpet (3.5.1) redis (4.5.1) redis-namespace (1.8.1) @@ -753,7 +753,7 @@ DEPENDENCIES omniauth-saml (~> 1.10) ox (~> 2.14) parslet - pg (~> 1.2) + pg (~> 1.3) pghero (~> 2.8) pkg-config (~> 1.4) posix-spawn @@ -770,7 +770,7 @@ DEPENDENCIES rails-controller-testing (~> 1.0) rails-i18n (~> 6.0) rails-settings-cached (~> 0.6) - rdf-normalize (~> 0.4) + rdf-normalize (~> 0.5) redcarpet (~> 3.5) redis (~> 4.5) redis-namespace (~> 1.8) |