Benjamin Neff
1c72dcc412
Merge branch 'next-minor' into develop
2022-09-10 01:16:09 +02:00
Benjamin Neff
52f206fa8a
Merge branch 'hotfix/0.7.18.1'
2022-09-10 01:13:25 +02:00
Dennis Schubert
9075dfa470
Update binstubs
...
Newly generated binstubs will check for the string
`This file was generated by Bundler` inside `bin/bundle`, so we'd have
to update that anyway.
Also, there is a non-zero chance the updated `bundle` binstub resolves
some of the setup-specific issues we've seen.
2022-09-10 00:43:20 +02:00
Benjamin Neff
1c064e016f
Merge pull request #8387 from denschub/linked-inline-code-color
...
Make inline code inside links show the link color.
2022-08-31 22:40:49 +02:00
Benjamin Neff
d18243b5cf
Merge pull request #8385 from SuperTux88/remove-therubyracer
...
Remove note about therubyracer from Gemfile
2022-08-31 22:38:25 +02:00
Dennis Schubert
0ede0233df
Make inline code inside links show the link color.
...
Fixes #8386
2022-08-26 20:24:32 +02:00
Benjamin Neff
6687f85164
Remove note about therubyracer from Gemfile
...
podmins should just install nodejs instead
2022-08-24 02:52:16 +02:00
Benjamin Neff
58483bdd2c
Merge branch 'next-minor' into develop
2022-07-31 23:14:32 +02:00
Benjamin Neff
9485a02639
Merge branch 'next-minor'
2022-07-31 23:12:00 +02:00
Benjamin Neff
eaedd3d26c
updated 11 locale files [ci skip]
2022-07-31 23:08:59 +02:00
Benjamin Neff
77af1b9942
Merge pull request #8383 from tclaus/show_available_pods
...
Prepare the backend for generating a list of active pods
2022-07-31 04:12:02 +02:00
Thorsten Claus
416c806012
Adding total and active count to pod view
...
The backend adds the total count for all pods, as well as the count for active pods.
In the frontend shows the new counts but without any further user interactions
2022-07-31 00:19:41 +02:00
Benjamin Neff
496ec4b059
Merge branch 'next-minor' into develop
2022-07-24 21:09:52 +02:00
Benjamin Neff
65909700f3
Merge pull request #8384 from SuperTux88/downgrade-bundler-next-minor
...
Downgrade Gemfile.lock to bundler 2.1.4
2022-07-24 21:08:14 +02:00
Benjamin Neff
586b319c79
Downgrade Gemfile.lock to bundler 2.1.4
...
This is the default bundler version that comes with ruby 2.7, and it
looks like ruby ruby 2.7 and bundler 2.3.18 have a problem with the new
splitted version where each gem source has it's own block and it
crashes.
To have less problems for podmins when updating, lets just downgrade
bundler and use the old lockfile format in next-minor. It's not a
problem anymore in develop as we don't have rails-assets anymore there,
as we switched to yarn.
2022-07-24 20:50:01 +02:00
Benjamin Neff
a661b0b608
Merge branch 'next-minor' into develop
2022-07-24 17:22:41 +02:00
Benjamin Neff
646685b42c
Handle Faraday::ServerError (for example 502) as HTTPFailure
...
closes #8380
2022-07-24 17:20:21 +02:00
Benjamin Neff
78b28c3d54
Handle nodeinfo timeouts gracefully
...
some (especially bigger pods) are sometimes slow to respond with
statistics, so lets handle that gracefully and not mark the pods as
down.
2022-07-24 17:19:04 +02:00
Benjamin Neff
b29675fead
Remove error if there was no error anymore
...
also add pod uri when logging offline pods ... just having a bunch of
"OFFLINE" log messages doesn't help at all.
2022-07-24 17:17:51 +02:00
Benjamin Neff
429a47d64d
Merge pull request #8381 from SuperTux88/fix-forgery-protection-for-federation
...
Bump diaspora_federation and enable forgery protection by default again
2022-07-24 01:30:43 +02:00
Benjamin Neff
9b6a2268e9
Bump diaspora_federation and enable forgery protection by default
2022-07-24 00:29:56 +02:00
Benjamin Neff
a88a25a5eb
Merge branch 'next-minor' into develop
2022-07-23 18:41:31 +02:00
Benjamin Neff
eb1c571511
Add xmppChat to NodeInfo 2.1 test for 0.7.x
...
Follow up for #8379
2022-07-23 18:40:11 +02:00
Benjamin Neff
78ea344454
Merge branch 'next-minor' into develop
2022-07-23 17:01:02 +02:00
Benjamin Neff
4efc4dabf8
Show software and version directly in the pods table if no errors
...
closes #8379
2022-07-23 17:00:48 +02:00
Benjamin Neff
01f8f55dbb
Add parsing of newer versions of NodeInfo
...
Always take the newest versions both nodes support
2022-07-23 16:59:41 +02:00
Benjamin Neff
49ba740b45
Add NodeInfo 2.1
2022-07-23 16:59:37 +02:00
Benjamin Neff
1be79fb40e
Merge pull request #8376 from SuperTux88/improve-setup-and-docker-scripts
...
Improve setup and docker scripts
2022-07-23 00:56:30 +02:00
Benjamin Neff
2af2bd80f7
Merge pull request #8378 from SuperTux88/add-dummy-host-meta
...
Add dummy host meta
2022-07-23 00:54:44 +02:00
Benjamin Neff
37a00173f5
Merge branch 'next-minor' into develop
2022-07-23 00:54:06 +02:00
Benjamin Neff
e984fa7d91
Don't use host-meta in connection tester anymore
...
This route was removed from the federation and doesn't exist anymore, so
checking for it doesn't make any sense.
But lets check if a server responds to /.well-known/nodeinfo instead.
All other software which supports the diaspora protocol should have this
endpoint by now. Parsing/validating nodeinfo is still handled
gracefully.
closes #8377
2022-07-23 00:53:07 +02:00
Benjamin Neff
419ed4d9fc
Remove old stubs for /.well-known/host-meta
...
Since the diaspora_federation gem doesn't try to access host-meta
anymore, there is no need to create stubs for it anymore.
2022-07-23 00:21:06 +02:00
Benjamin Neff
ed8e340fa2
Add a dummy route for /.well-known/host-meta
...
This was removed from the diaspora_federation gem, since it's not used
for the federation/discovery anymore since a long time. But old versions
of the ConnectionTester up to version 0.7.17 still check if this route
exist or else they mark the pod as offline. So lets add a dummy
host-meta with an empty response back, so the ConnectionTester is happy
again until we can remove this workaround again.
2022-07-23 00:17:06 +02:00
Benjamin Neff
662635fe35
Upgrade development Dockerfile to debian bullseye
...
to have a current version of yarn
2022-07-21 23:24:55 +02:00
Benjamin Neff
fdcea3e824
Add yarn command to the diaspora-dev docker script
2022-07-21 23:24:55 +02:00
Benjamin Neff
95a9c329af
Add command for bin/setup to the diaspora-dev docker script
...
and also use it for the initial setup command, so it also install yarn
dependencies
2022-07-21 23:24:55 +02:00
Benjamin Neff
08e6f1e2a3
Configure bundler and copy example configs on bin/setup
...
and also remove `bin/rails restart`, this does nothing for us at the
moment anyway, so just remove it.
2022-07-21 23:13:44 +02:00
Benjamin Neff
9b24407b68
Merge branch 'next-minor' into develop
2022-07-21 05:31:11 +02:00
Dennis Schubert
428c97d089
Disable the default CSRF protection.
...
This was added in Rails 5.2 defaults, but we upgraded from 5.1 defaults to 6.1, so we didn't notice until now.
closes #8374
2022-07-21 05:30:55 +02:00
Benjamin Neff
975afe03bb
Merge branch 'next-minor' into develop
2022-07-21 04:00:30 +02:00
Benjamin Neff
3cf84c838f
Disable export_concurrent to prevent segfault during precompile
...
See https://github.com/sass/sassc-ruby/issues/207
closes #8372
2022-07-21 03:57:26 +02:00
Benjamin Neff
ee68da7eeb
Don't eager load active storage in production
...
We don't use active storage, but eager loading it tries to read the
config/storage.yml, which doesn't exist, because we don't need it.
571b4d5fb9/activestorage/lib/active_storage/engine.rb (L137)571b4d5fb9/activestorage/app/models/active_storage/blob.rb (L354)closes #8371
2022-07-21 03:53:47 +02:00
Benjamin Neff
d6436f4d03
Merge pull request #8368 from SuperTux88/upgrade-diaspora-federation
...
Upgrade diaspora federation (and some preparations for ruby 3)
2022-07-21 02:22:43 +02:00
Benjamin Neff
022f367692
Fix some keyword args for ruby 3 compatibility
2022-07-21 01:25:53 +02:00
Benjamin Neff
93c69c4d42
Bump factory_bot for ruby 3 support
2022-07-20 23:13:06 +02:00
Benjamin Neff
111b3cdc8e
Upgrade diaspora_federation to 1.0
2022-07-20 23:06:18 +02:00
Benjamin Neff
c2acf6168a
Merge branch 'next-minor' into develop
2022-07-20 22:59:36 +02:00
Benjamin Neff
2e3bd14a09
Fix some update_attributes in tests only on next-minor
...
These were already fixed on develop in another branch but were never
backported, so lets do that now.
2022-07-20 22:59:30 +02:00
Benjamin Neff
8299aabc25
Drop ruby 2.6 to allow new diaspora_federation version
2022-07-20 22:42:01 +02:00
Benjamin Neff
03d2001cf2
Update yarn files for rails 6
...
Also allow `yarnpkg` binary for `bin/yarn`
2022-07-20 21:35:22 +02:00
