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
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
9b6a2268e9
Bump diaspora_federation and enable forgery protection by default
2022-07-24 00:29:56 +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
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
111b3cdc8e
Upgrade diaspora_federation to 1.0
2022-07-20 23:06:18 +02:00
Benjamin Neff
d4079070ed
Merge branch 'next-minor' into develop
2022-07-20 21:34:39 +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
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
cmrd Senya
3c3b988603
Merge branch 'develop' into use-yarn-for-assets
2022-07-17 13:07:09 +03:00
Benjamin Neff
5669ba6b48
Merge branch 'next-minor' into develop
2022-07-16 04:44:59 +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
cmrd Senya
b8b448ae40
Use yarn for front-end dependencies instead of rails-assets
2022-07-12 22:02:05 +03:00
Benjamin Neff
1e3386c77a
Merge branch 'next-minor' into develop
2022-07-03 20:44:24 +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
add707252a
Merge branch 'next-minor' into develop
...
... and also remove json-schema-rspec dependency from api specs
2022-06-28 02:08:42 +02:00
Benjamin Neff
8c4381c1ce
Bump sidekiq and sidekiq-cron
2022-06-27 02:53:12 +02:00
Dennis Schubert
058090afe7
Start 0.7.18.0 cycle
2022-04-27 21:15:32 +02:00
Dennis Schubert
02eba842ae
Merge branch 'next-minor'
2022-04-27 21:11:26 +02:00
Benjamin Neff
5d81555ae1
Merge branch 'next-minor' into develop
2022-03-05 16:31:34 +01:00
Dennis Schubert
7611391f9f
Don't suggest to retry exports on failure.
...
closes #8343
2022-03-05 16:31:25 +01:00
Benjamin Neff
36778dbeac
Remove /user/auth_token route, this was a leftover from the chat
...
Also remove authentication_token from database
2022-02-27 23:06:24 +01:00
Benjamin Neff
7e889f71eb
Merge branch 'next-minor' into develop
2022-02-12 00:12:01 +01:00
Benjamin Neff
d896744ca1
Start 0.7.17.0 cycle
2022-02-12 00:07:58 +01:00
Benjamin Neff
82291ed7e7
Merge branch 'next-minor'
2022-02-12 00:06:20 +01:00
Benjamin Neff
d7fb7405ae
updated 25 locale files [ci skip]
2022-02-11 23:59:53 +01:00
Benjamin Neff
96493b4a5c
Refactory archive concurrency so the same logic can be reused
2021-11-23 01:48:33 +01:00
Benjamin Neff
4902a35972
Merge branch 'next-minor' into develop
2021-11-23 00:56:41 +01:00
Benjamin Neff
fef6380721
Bump js-routes
2021-11-06 02:35:57 +01:00
Benjamin Neff
d1e0b163e2
Merge branch 'next-minor' into develop
2021-10-30 03:14:55 +02:00
Benjamin Neff
39ab87d111
Remove deprecated Sidekiq::Web.sessions
...
See https://github.com/mperham/sidekiq/pull/4804
closes #8311
2021-10-30 03:11:23 +02:00
Benjamin Neff
95c0bb9ef2
Merge branch 'next-minor' into develop
2021-10-25 03:46:48 +02:00
Benjamin Neff
3cb1e470a4
Resend AccountMigration or AccountDeletion for closed recipients
2021-10-25 03:34:03 +02:00
Benjamin Neff
3292ce64fc
Change placeholder in translations for #8304
2021-10-25 03:26:05 +02:00
Benjamin Neff
89cd77751f
Change placeholder in translations for #8037
2021-10-25 03:26:04 +02:00
Benjamin Neff
d22ae06cff
updated 82 locale files [ci skip]
2021-10-25 03:26:04 +02:00
flaburgan
5b3f75f011
Remind the username in the reset password e-mail
...
closes #8037
2021-10-25 01:58:47 +02:00
Benjamin Neff
274edf7589
Merge branch 'next-minor' into develop
2021-09-19 14:30:07 +02:00
Thorsten Claus
4c337c6952
8139 add a podmin mail to footer
...
fixes #8139
closes #8242
2021-09-19 14:27:46 +02:00
