Merge branch 'refs/heads/glitch-soc' into develop

# Conflicts:
#	app/javascript/flavours/glitch/actions/interactions.js
#	app/javascript/flavours/glitch/reducers/statuses.js
This commit is contained in:
Jeremy Kescher 2024-05-29 14:23:08 +02:00
commit 6d448d46ff
No known key found for this signature in database
GPG key ID: 80A419A7A613DFA4
138 changed files with 1578 additions and 1087 deletions

View file

@ -103,6 +103,8 @@ gem 'rdf-normalize', '~> 0.5'
gem 'private_address_check', '~> 0.5'
gem 'opentelemetry-api', '~> 1.2.5'
group :opentelemetry do
gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false

View file

@ -732,7 +732,7 @@ GEM
rspec-mocks (~> 3.0)
sidekiq (>= 5, < 8)
rspec-support (3.13.1)
rubocop (1.63.5)
rubocop (1.64.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
@ -883,7 +883,7 @@ GEM
webfinger (1.2.0)
activesupport
httpclient (>= 2.4)
webmock (3.23.0)
webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -981,6 +981,7 @@ DEPENDENCIES
omniauth-rails_csrf_protection (~> 1.0)
omniauth-saml (~> 2.0)
omniauth_openid_connect (~> 0.6.1)
opentelemetry-api (~> 1.2.5)
opentelemetry-exporter-otlp (~> 0.26.3)
opentelemetry-instrumentation-active_job (~> 0.7.1)
opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)

View file

Internal server error - The gay git

500

Internal server error

Forgejo version: 9.0.3

@ -44,7 +44,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController