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
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
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
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
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
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
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
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
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
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
3c4da76be5
Fix follow up tasks for assets:precompile when no manifest existed
...
When no `.sprockets-manifest-xxx.json` existed, every instance of
`Sprockets::Manifest` generated their own path with their own random
filename, and since this happened before the assets were actually
precompiled, they were all empty. So the error pages didn't find the
manifest and the non-digest assets also didn't have any assets to copy.
So lets create our own instance of `Sprockets::Manifest` here, AFTER
`assets:precompile`, which then loads the manifest json that was used
during precompile, so all precompiled assets are available.
closes #8366
2022-07-20 21:32:21 +02:00
Benjamin Neff
3b02eb87bd
Upgrade to bundler 2
2022-07-20 21:32:11 +02:00
Benjamin Neff
c72b30130e
Bump sidekiq and sidekiq-cron
2022-07-20 21:27:53 +02:00
Benjamin Neff
01ab639736
Bump acts-as-taggable-on
2022-07-20 21:27:52 +02:00
Benjamin Neff
8a1e3fbec2
Bump nokogiri
2022-07-20 21:27:46 +02:00
Benjamin Neff
c1c9469840
Add ruby 2.7, drop ruby 2.5
2022-07-20 21:27:46 +02:00
Benjamin Neff
3bb9b9a18d
Fix deprecation warnings for rails 6.1
2022-07-20 21:27:41 +02:00
Benjamin Neff
fe84d3e101
Upgrade to rails 6.1
2022-07-20 21:27:41 +02:00
Benjamin Neff
1ef3c83a0a
Remove workaround for schema.rb
...
We don't have the schema.rb anymore in the repo, so we don't need it
compatible with both databases anymore.
See 5b1be7d8da
2022-07-20 21:26:58 +02:00
Benjamin Neff
ac86c29a85
Use template_name instead of action_name for notification mails
...
This is a new feature in rails 6
2022-07-20 21:26:58 +02:00
Benjamin Neff
17b84d3ddd
Fix rendering of error pages to remove deprecation warning for rails 6.0
2022-07-20 21:26:58 +02:00
Benjamin Neff
b5a46cf7bb
Fix deprecation warnings for rails 6.0
2022-07-20 21:26:58 +02:00
Benjamin Neff
2d38a24a86
Upgrade to rails 6.0
2022-07-20 21:26:58 +02:00
Benjamin Neff
2f30b42d93
Don't load sidekiq workers during initialization
...
This is to prevent the warning about zeitwerk autoloader
2022-07-20 21:26:40 +02:00
Benjamin Neff
14e27a65ae
Move ActsAsTaggableOn::Tag overrides to initializer
...
This is to prepare for zeitwerk autoloader, and the old file couldn't be
autoloaded anyway, so the easiest is to just move it out of the models
folder.
2022-07-20 21:26:40 +02:00
Benjamin Neff
429aa8f374
Upgrade to sprockets 4
2022-07-20 21:26:40 +02:00
Benjamin Neff
0382cb48c1
Bump diaspora_federation to support rails 6
2022-07-20 21:26:13 +02:00
Benjamin Neff
13eb095e83
Bump js_image_paths to support rails 6 and sprockets 4
2022-07-20 21:25:51 +02:00
Benjamin Neff
3598a17ee2
Update .gitignore from develop branch
2022-07-18 00:54:42 +02:00
Benjamin Neff
a5e5c7f378
Fix Link to OWASP CSRF more information page
...
closes #8365
2022-07-16 04:44:17 +02:00
Benjamin Neff
dd3bc39c97
Render markdown to html for notifications
2022-07-16 04:34:07 +02:00
Benjamin Neff
3c02a1f067
Remove unused translation fallback
2022-07-16 04:22:51 +02:00
Benjamin Neff
a9ae84f3a6
Remove markerb dependency
...
markerb is dead and isn't compatible with rails 6 anymore. Removing it
means adding separate templates for text and html, this sadly means some
code duplication, but also luckily the templates aren't that
complicated, so the duplication is also very minimal.
2022-07-16 04:22:51 +02:00
Benjamin Neff
6cea355636
Fix escaping of names in the from header
2022-07-16 04:22:51 +02:00
Benjamin Neff
f76a8d7deb
Fix sending mails after photo export
2022-07-16 04:22:51 +02:00
Benjamin Neff
41633fcea9
Don't autoload PeopleHelper during initialization
...
this is for future rails versions with zeitwerk autoloader where this
isn't allowed anymore
2022-07-16 04:22:51 +02:00
Benjamin Neff
a7a02e87cf
Replace unmaintained sass-rails with sassc-rails
...
closes #8362
2022-07-03 23:14:42 +02:00
Benjamin Neff
485af7ea78
Remove compass-rails and just use the few images without a sprite
...
Fixes #6433
2022-07-03 23:14:01 +02:00
Benjamin Neff
5f48cedb84
Remove entypo-rails dependency and add font to vendor/assets
...
entypo-rails doesn't support newer rails versions
closes #8361
2022-07-03 20:44:10 +02:00
Benjamin Neff
739fc780c3
Manually stringify keys to fix sidekiq 7.0 deprecation warning
...
closes #8359
2022-06-29 13:27:37 +02:00
Benjamin Neff
2d9f133d30
Merge pull request #8357 from SuperTux88/gem-updates
...
Gem updates
2022-06-28 00:43:11 +02:00
Benjamin Neff
3ff162320e
Bump rails-assets-jquery and jquery-rails
2022-06-27 03:21:28 +02:00
