Benjamin Neff
5e47c284b6
Merge branch 'next-minor' into develop
2021-10-01 02:12:37 +02:00
Benjamin Neff
dc99f0f77a
Fix namespace for LineLength rule
...
closes #8303
2021-10-01 02:12:33 +02:00
Benjamin Neff
59baef3146
Enable HashTransform rules in rubocop because we have ruby >= 2.5 now
2021-10-01 02:12:25 +02:00
Benjamin Neff
0bb4ffce89
Disable Style/AccessorGrouping in rubocop
...
It makes more sense to allow to structure and group accessors how it
makes sense in the code instead of enforcing it to be grouped in a
specific way.
2021-10-01 02:12:25 +02:00
Benjamin Neff
b2a56376cd
Fix running jasmine tests in docker
...
closes #8299
2021-10-01 02:11:36 +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
991148bd30
Merge branch 'next-minor' into develop
2021-09-19 03:47:12 +02:00
Benjamin Neff
d39a4e3621
Also need to handle account_migration in AccountDeleter spec
...
Also backported from #7660
2021-09-19 03:45:52 +02:00
Benjamin Neff
c05079d1d3
Merge branch 'next-minor' into develop
2021-09-19 03:41:51 +02:00
Benjamin Neff
fab48ee96d
Also need to exclude account_migration from persons reference
...
Also backported from #7660
2021-09-19 03:41:26 +02:00
Benjamin Neff
e902261c45
Merge branch 'next-minor' into develop
2021-09-19 03:14:07 +02:00
Benjamin Neff
b8ea120ff2
Backport account_migration relation on person from #7660
2021-09-19 03:13:02 +02:00
Benjamin Neff
c740660c0c
Merge pull request #8260 from tclaus/import_zipped_archive
...
Migration: Import compressed archive file handling
2021-09-19 02:28:43 +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
Thorsten Claus
85a5744867
Import compressed archive file
2021-09-19 02:14:50 +02:00
Benjamin Neff
2081f39a72
Merge pull request #8010 from cmrd-senya/fix-archive-edge-cases
...
Fix archive edge cases
closes #8017
closes #8257
2021-09-18 19:29:56 +02:00
Benjamin Neff
750186319e
Merge branch 'next-minor' into develop
2021-09-18 19:24:20 +02:00
Thorsten Claus
8f9ac33649
Using shared markdown options for plain text
...
fixes #7960
closes #8277
2021-09-18 19:22:27 +02:00
Thorsten Claus
c71caa5cb8
#7960 Add support for Markdown footnote syntax in Mobile view
...
Splitting stripdown and markdownify options, because the footnote option seems to let the Redcarpet::Render::StripDown function crash
2021-09-18 19:19:02 +02:00
Thorsten Claus
122e12a068
#7960 Add support for Markdown footnote syntax
2021-09-18 19:19:02 +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
Thorsten Claus
8392c894d2
ensure ./log folder exists
...
closes #8287
2021-09-18 19:18:03 +02:00
Thorsten Claus
4630b49ec4
Update reshare import test with more generic test from #8257 and #8017
...
Just test for generic NotFetchable error, which also includes the root
author failing to be fetched.
2021-09-18 18:09:30 +02:00
cmrd Senya
9723bd37a7
Fix relayable import when parent is not fetchable
2021-09-18 18:09:30 +02:00
cmrd Senya
1ec0314752
Fix reshare import when root is not fetchable
2021-09-18 04:44:19 +02:00
Benjamin Neff
413926b56e
Merge branch 'next-minor' into develop
2021-08-16 01:03:05 +02:00
Benjamin Neff
b2ba0123e1
Fix FactoryBot for next-minor
2021-08-16 01:02:08 +02:00
Thorsten Claus
cdb50edabc
Person.find_or_fetch_by_identifier never return nil
...
Person.find_or_fetch_by_identifier raises an exception if person is not found localy and not fetchable. It never returns nil. These code changes take care about this behaviour and changes specs and code to behave equally.
Close #8273
2021-08-16 00:24:59 +02:00
Benjamin Neff
e2b96c81f2
Merge branch 'next-minor' into develop
2021-08-16 00:24:47 +02:00
Thorsten Claus
8691e650dc
Person.find_or_fetch_by_identifier never return nil
...
Person.find_or_fetch_by_identifier raises an exception if person is not found localy and not fetchable. It never returns nil. These code changes take care about this behaviour and changes specs and code to behave equally.
Also related to #8253
2021-08-16 00:24:33 +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
d02848c216
Merge branch 'next-minor' into develop
2021-07-26 02:37:40 +02:00
Thorsten Claus
07a49de7e1
Using galleries default border radius Small indicator images in image gallery are round ones, this doesn't correspond with preview shown in stream. It also doesn't look good on real-world images. (may look OK for User profile images)
...
closes #8275
2021-07-26 02:37:22 +02:00
Benjamin Neff
7d0c29e99a
Update repo data before trying to install packages
...
closes #8276
2021-07-26 02:31:53 +02:00
Benjamin Neff
8d5abe8892
Merge pull request #8264 from tclaus/migration_importing_blocks
...
Migration: Importing user blocks
2021-07-13 01:40:04 +02:00
Benjamin Neff
2e6ae8c967
Merge pull request #8254 from tclaus/8106_set_contact_status_on_account_migration
...
Migration: set share status in contacts
closes #8106
2021-07-13 01:36:48 +02:00
Thorsten Claus
1ec7bd7ce1
Migration: Importing user blocks
...
Migration: fix error on blocks import
2021-07-13 01:22:14 +02:00
Benjamin Neff
7896dbada5
Merge branch 'next-minor' into develop
2021-07-04 23:28:20 +02:00
Benjamin Neff
7e9987b7f5
Downgrade ethon because of https://github.com/typhoeus/ethon/issues/194
...
closes #8267
2021-07-04 23:28:15 +02:00
Dennis Schubert
0810fa77e9
Remove special-case for diaspora-handle lookups in people controller.
...
Thss partly reverts a475d5fb62 . The special case here was only ever used for the chat, which no longer exists.
2021-07-04 22:10:20 +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 b3ca504c40 . We don't quite know why that was added, but we assume it's because of format strings. Some pre-2011 users exist that still have dots or dashes in their username, and those accounts are somewhat broken now.
closes #8266
2021-07-04 22:07:21 +02:00
Benjamin Neff
8f804e376a
Don't export chat_enabled flag anymore
...
The chat is already removed for 0.8, so there is no need to still export
this data since it can't be imported anyway.
Related to #8069
closes #8265
2021-07-04 22:03:37 +02:00
Benjamin Neff
caeeac6c59
Merge branch 'next-minor' into develop
2021-07-03 03:03:32 +02:00
Benjamin Neff
342d4f7fde
Add blocks to archive json schema
2021-07-03 03:00:45 +02:00
Thorsten Claus
b31f9106a1
Migration: Exporting user blocks
...
closes #8263
2021-07-03 02:51:41 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop
2021-06-30 23:27:57 +02:00