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
Benjamin Neff
0e7c91aeac
Merge branch 'next-minor' into develop
2021-09-19 02:22:05 +02:00
Thorsten Claus
2a99cc93ba
diaspora should send AccountMigration message back when a federation message received for a moved account
...
I use Senya's Patch for this
The extra check is for satisfying tests, which don't create real database objects.
fixes #7902
closes #8288
2021-09-19 02:20:38 +02:00
Benjamin Neff
750186319e
Merge branch 'next-minor' into develop
2021-09-18 19:24:20 +02:00
Benjamin Neff
28f03f0a11
Cleanup person_by_handle route
...
I think this is a leftover from a long time ago and I can't find
anything that still uses that
closes #8280
2021-09-18 19:18:34 +02:00
Benjamin Neff
e2b96c81f2
Merge branch 'next-minor' into develop
2021-08-16 00:24:47 +02:00
Pirate Praveen
20a3abd864
Switch to terser gem from uglifier for JS compression
...
closes #8268
2021-08-16 00:21:17 +02:00
Benjamin Neff
4c46ca1a94
Merge branch 'next-minor' into develop
2021-07-04 22:09:32 +02:00
Dennis Schubert
805a35e985
Point /protocol route to the current federation documentation.
2021-07-04 22:07:51 +02:00
Dennis Schubert
407f51d5a3
Allow points and dashes in the username.
...
This reverts b3ca504c40closes #8266
2021-07-04 22:07:21 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop
2021-06-30 23:27:57 +02:00
Benjamin Neff
dc3bef6a93
Bump carrierwave
2021-06-28 01:28:15 +02:00
