lbm
2 years agoChecking in stuff that was not checked in. develop
Pete [Tue, 7 Apr 2020 17:20:23 +0000 (10:20 -0700)]
Checking in stuff that was not checked in.

3 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
@p [Mon, 11 Nov 2019 18:40:10 +0000 (18:40 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

3 years agoCommitting style.
@p [Mon, 11 Nov 2019 18:37:04 +0000 (18:37 +0000)]
Committing style.

3 years agoMerge branch 'fix-dokku-2' into 'develop'
lain [Mon, 11 Nov 2019 15:01:31 +0000 (15:01 +0000)]
Merge branch 'fix-dokku-2' into 'develop'

Dokku deploys: Keep the git dir so version number generation works.

See merge request pleroma/pleroma!1967

3 years agoMerge branch 'patch-1' into 'develop'
rinpatch [Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)]
Merge branch 'patch-1' into 'develop'

Default config: Use extended nickname format

See merge request pleroma/pleroma!1968

3 years agoMerge branch 'chore/changelog-1940' into 'develop'
rinpatch [Mon, 11 Nov 2019 14:07:23 +0000 (14:07 +0000)]
Merge branch 'chore/changelog-1940' into 'develop'

Add a changelog entry for !1940

See merge request pleroma/pleroma!1970

3 years agoAdd a changelog entry for !1940
rinpatch [Mon, 11 Nov 2019 14:05:30 +0000 (17:05 +0300)]
Add a changelog entry for !1940

3 years agoMerge branch 'update-ci' into 'develop'
lain [Mon, 11 Nov 2019 13:13:20 +0000 (13:13 +0000)]
Merge branch 'update-ci' into 'develop'

Use PG12 in CI for the RUM pipeline

Closes #1377

See merge request pleroma/pleroma!1969

3 years agoDefault config: Use extended nickname format
lain [Mon, 11 Nov 2019 12:49:18 +0000 (12:49 +0000)]
Default config: Use extended nickname format

3 years agoUse PG12 in CI for the RUM pipeline
Egor Kislitsyn [Mon, 11 Nov 2019 12:47:33 +0000 (19:47 +0700)]
Use PG12 in CI for the RUM pipeline

3 years agoDokku deploys: Keep the git dir so version number generation works.
lain [Mon, 11 Nov 2019 12:37:56 +0000 (13:37 +0100)]
Dokku deploys: Keep the git dir so version number generation works.

3 years agoMerge branch 'update-docs' into 'develop'
lain [Mon, 11 Nov 2019 12:34:17 +0000 (12:34 +0000)]
Merge branch 'update-docs' into 'develop'

Add a warning about Pg version to the RUM related docs

See merge request pleroma/pleroma!1966

3 years agoMerge branch 'iss-1376' into 'develop'
lain [Mon, 11 Nov 2019 12:27:33 +0000 (12:27 +0000)]
Merge branch 'iss-1376' into 'develop'

Check client and token in GET /oauth/authorize

See merge request pleroma/pleroma!1940

3 years agoMerge branch 'fix/1399' into 'develop'
lain [Mon, 11 Nov 2019 12:13:45 +0000 (12:13 +0000)]
Merge branch 'fix/1399' into 'develop'

fix for migrate config to db task

Closes #1399

See merge request pleroma/pleroma!1964

3 years agoAdd a warning about Pg version to the RUM related docs
Egor Kislitsyn [Mon, 11 Nov 2019 12:13:07 +0000 (19:13 +0700)]
Add a warning about Pg version to the RUM related docs

3 years agoMerge branch 'new-rate-limiter' into 'develop'
lain [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
Merge branch 'new-rate-limiter' into 'develop'

New rate limiter

See merge request pleroma/pleroma!1946

3 years agoNew rate limiter
Steven Fuchs [Mon, 11 Nov 2019 12:13:06 +0000 (12:13 +0000)]
New rate limiter

3 years agofix for migrate task
Alexander [Sun, 10 Nov 2019 19:54:37 +0000 (22:54 +0300)]
fix for migrate task

3 years agoMerge branch 'disable-attachment-links' into 'develop'
lain [Sun, 10 Nov 2019 14:25:09 +0000 (14:25 +0000)]
Merge branch 'disable-attachment-links' into 'develop'

Disable attachment links by default

Closes #1394

See merge request pleroma/pleroma!1962

3 years agoDisable attachment links by default
rinpatch [Sun, 10 Nov 2019 12:02:47 +0000 (15:02 +0300)]
Disable attachment links by default

Closes #1394

3 years agoMerge branch 'issue/1339' into 'develop'
lain [Sun, 10 Nov 2019 11:20:20 +0000 (11:20 +0000)]
Merge branch 'issue/1339' into 'develop'

[#1339] add subject to atom feed

See merge request pleroma/pleroma!1961

3 years agoApply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 11:02:34 +0000 (11:02 +0000)]
Apply suggestion to config/config.exs

3 years agoApply suggestion to config/config.exs
lain [Sun, 10 Nov 2019 10:44:23 +0000 (10:44 +0000)]
Apply suggestion to config/config.exs

3 years agoMerge branch 'refactor/readme' into 'develop'
lain [Sun, 10 Nov 2019 10:30:52 +0000 (10:30 +0000)]
Merge branch 'refactor/readme' into 'develop'

Partial readme rewrite

See merge request pleroma/pleroma!1958

3 years agoadd subject to atom feed
Maksim Pechnikov [Fri, 8 Nov 2019 06:23:24 +0000 (09:23 +0300)]
add subject to atom feed

3 years agoMerge branch 'refactor/cheatsheet' into 'develop'
kaniini [Sun, 10 Nov 2019 00:56:01 +0000 (00:56 +0000)]
Merge branch 'refactor/cheatsheet' into 'develop'

Big config cheatsheet revamp

See merge request pleroma/pleroma!1959

3 years agoBig config cheatsheet revamp
rinpatch [Sun, 10 Nov 2019 00:33:36 +0000 (03:33 +0300)]
Big config cheatsheet revamp

Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.

3 years agoreadme: replace banner logo with the one using paths for text
rinpatch [Sat, 9 Nov 2019 21:52:04 +0000 (00:52 +0300)]
readme: replace banner logo with the one using paths for text

3 years agoreadme: Add logo banner
rinpatch [Sat, 9 Nov 2019 21:06:44 +0000 (00:06 +0300)]
readme: Add logo banner

3 years agoreadme: remove unnecessary heading
rinpatch [Sat, 9 Nov 2019 20:32:21 +0000 (23:32 +0300)]
readme: remove unnecessary heading

3 years agoreadme: Remove unnecessary description and add a missing dot
rinpatch [Sat, 9 Nov 2019 20:30:03 +0000 (23:30 +0300)]
readme: Remove unnecessary description and add a missing dot

3 years agoAdd #pleroma-dev to matrix section as well
rinpatch [Sat, 9 Nov 2019 19:10:29 +0000 (22:10 +0300)]
Add #pleroma-dev to matrix section as well

3 years agoPartial readme rewrite
rinpatch [Sat, 9 Nov 2019 19:01:25 +0000 (22:01 +0300)]
Partial readme rewrite

Remove the outdated generic installation guide and point to
platform-specific ones instead, update contact info, protocols we
support, etc.

3 years agoMerge branch 'chore/update-fe' into 'develop'
rinpatch [Fri, 8 Nov 2019 23:08:03 +0000 (23:08 +0000)]
Merge branch 'chore/update-fe' into 'develop'

Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642

See merge request pleroma/pleroma!1956

3 years agoBump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
rinpatch [Fri, 8 Nov 2019 22:47:32 +0000 (01:47 +0300)]
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642

3 years agoMerge branch 'bugfix/containment-no-id' into 'develop'
rinpatch [Fri, 8 Nov 2019 21:12:23 +0000 (21:12 +0000)]
Merge branch 'bugfix/containment-no-id' into 'develop'

object containment: handle all cases where ID is invalid (missing, nil, non-string)

Closes #1387

See merge request pleroma/pleroma!1955

3 years agoobject containment: handle all cases where ID is invalid (missing, nil, non-string)
Ariadne Conill [Fri, 8 Nov 2019 20:51:28 +0000 (14:51 -0600)]
object containment: handle all cases where ID is invalid (missing, nil, non-string)

3 years agoMerge branch 'chore/bump-fast-sanitize-again-again' into 'develop'
rinpatch [Fri, 8 Nov 2019 20:02:25 +0000 (20:02 +0000)]
Merge branch 'chore/bump-fast-sanitize-again-again' into 'develop'

Bump fast_sanitize

See merge request pleroma/pleroma!1953

3 years agoBump fast_sanitize
rinpatch [Fri, 8 Nov 2019 19:22:39 +0000 (22:22 +0300)]
Bump fast_sanitize

Fixes build fails on freebsd

3 years agoMerge branch 'chore/add-multifetch' into 'develop'
kaniini [Fri, 8 Nov 2019 19:08:39 +0000 (19:08 +0000)]
Merge branch 'chore/add-multifetch' into 'develop'

nodeinfo: add multifetch feature (ref pleroma-fe!977).

See merge request pleroma/pleroma!1952

3 years agonodeinfo: add multifetch feature (ref pleroma-fe!977).
Ariadne Conill [Fri, 8 Nov 2019 18:48:28 +0000 (12:48 -0600)]
nodeinfo: add multifetch feature (ref pleroma-fe!977).

3 years agoMerge branch 'chore/bump-fast-sanitize-again' into 'develop'
rinpatch [Fri, 8 Nov 2019 17:01:07 +0000 (17:01 +0000)]
Merge branch 'chore/bump-fast-sanitize-again' into 'develop'

Bump fast_sanitize to 0.1.2

See merge request pleroma/pleroma!1951

3 years agoBump fast_sanitize to 0.1.2
rinpatch [Fri, 8 Nov 2019 16:40:13 +0000 (19:40 +0300)]
Bump fast_sanitize to 0.1.2

Fixes build issues on macOS

3 years agoMerge branch 'chore/bump-fast-sanitize' into 'develop'
rinpatch [Thu, 7 Nov 2019 23:32:25 +0000 (23:32 +0000)]
Merge branch 'chore/bump-fast-sanitize' into 'develop'

Bump fast_sanitize to 0.1.1

Closes #1378

See merge request pleroma/pleroma!1949

3 years agoBump fast_sanitize to 0.1.1
rinpatch [Thu, 7 Nov 2019 21:14:53 +0000 (00:14 +0300)]
Bump fast_sanitize to 0.1.1

The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.

Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.

3 years agoMerge branch 'recipients-filter' into 'develop'
kaniini [Thu, 7 Nov 2019 15:13:20 +0000 (15:13 +0000)]
Merge branch 'recipients-filter' into 'develop'

Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`

See merge request pleroma/pleroma!1948

3 years agoMastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
eugenijm [Thu, 7 Nov 2019 00:00:21 +0000 (03:00 +0300)]
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`

3 years agoMerge branch 'fix/unwrapped-object-return' into 'develop'
rinpatch [Wed, 6 Nov 2019 23:01:04 +0000 (23:01 +0000)]
Merge branch 'fix/unwrapped-object-return' into 'develop'

Fetcher: fix local check returning unwrapped object

See merge request pleroma/pleroma!1947

3 years agoFetcher: fix local check returning unwrapped object
rinpatch [Wed, 6 Nov 2019 22:40:55 +0000 (01:40 +0300)]
Fetcher: fix local check returning unwrapped object

This resulted in error messages about failed refetches being logged.

3 years agoMerge branch 'fix/trailing-format-plug-oauth' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:47:34 +0000 (14:47 +0000)]
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'

Fix TrailingFormatPlug not being active for /api/oauth_tokens

Closes #1385

See merge request pleroma/pleroma!1944

3 years agoMerge branch 'changelog-cleanup' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:39:46 +0000 (14:39 +0000)]
Merge branch 'changelog-cleanup' into 'develop'

Removed duplicate Changed entry in Unreleased section of CHANGELOG.md

See merge request pleroma/pleroma!1945

3 years agoMerge branch 'fix/saner-static-cache-control' into 'develop'
rinpatch [Wed, 6 Nov 2019 14:31:32 +0000 (14:31 +0000)]
Merge branch 'fix/saner-static-cache-control' into 'develop'

Set better Cache-Control header for static content

Closes #1382

See merge request pleroma/pleroma!1943

3 years agoFix TrailingFormatPlug not being active for /api/oauth_tokens
rinpatch [Wed, 6 Nov 2019 14:22:23 +0000 (17:22 +0300)]
Fix TrailingFormatPlug not being active for /api/oauth_tokens

3 years agoRemoved duplicate Changed entry in Unreleased section of CHANGELOG.md.
Ivan Tashkinov [Wed, 6 Nov 2019 14:19:32 +0000 (17:19 +0300)]
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.

3 years agoSet better Cache-Control header for static content
rinpatch [Wed, 6 Nov 2019 13:41:19 +0000 (16:41 +0300)]
Set better Cache-Control header for static content

Closes #1382

3 years agoMerge branch 'feature/multiple-users-force-password-reset' into 'develop'
feld [Wed, 6 Nov 2019 12:24:41 +0000 (12:24 +0000)]
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'

Force password reset for multiple users

Closes admin-fe#46

See merge request pleroma/pleroma!1928

3 years agoMerge branch 'fix/object-reinject-set-cache' into 'develop'
rinpatch [Wed, 6 Nov 2019 11:20:34 +0000 (11:20 +0000)]
Merge branch 'fix/object-reinject-set-cache' into 'develop'

Object Fetcher: set cache after reinjecting

See merge request pleroma/pleroma!1942

3 years agoObject Fetcher: set cache after reinjecting
rinpatch [Wed, 6 Nov 2019 11:00:03 +0000 (14:00 +0300)]
Object Fetcher: set cache after reinjecting

Probably fixes the issue hj had, where polls would have different
counters between endpoints.

3 years agoMerge branch 'ci/remove-docs-build' into 'develop'
Haelwenn [Wed, 6 Nov 2019 01:13:20 +0000 (01:13 +0000)]
Merge branch 'ci/remove-docs-build' into 'develop'

CI: Remove the docs-build job

See merge request pleroma/pleroma!1941

3 years agoCI: Remove the docs-build job
rinpatch [Tue, 5 Nov 2019 20:45:07 +0000 (23:45 +0300)]
CI: Remove the docs-build job

The artifacts it produces were no longer used since we switched to
mkdocs.

3 years agoCheck client and token in GET /oauth/authorize
AkiraFukushima [Tue, 5 Nov 2019 14:52:47 +0000 (23:52 +0900)]
Check client and token in GET /oauth/authorize

3 years agoMerge branch 'chore/bump-htmlentities' into 'develop'
rinpatch [Tue, 5 Nov 2019 10:01:29 +0000 (10:01 +0000)]
Merge branch 'chore/bump-htmlentities' into 'develop'

Bump HtmlEntities to 0.5

See merge request pleroma/pleroma!1939

3 years agoBump HtmlEntities to 0.5
rinpatch [Tue, 5 Nov 2019 09:37:25 +0000 (12:37 +0300)]
Bump HtmlEntities to 0.5

This release brings a major performance imrovement, see
https://github.com/martinsvalin/html_entities/pull/17

3 years agoMerge branch 'develop' into feature/multiple-users-force-password-reset
Maxim Filippov [Tue, 5 Nov 2019 01:36:47 +0000 (11:36 +1000)]
Merge branch 'develop' into feature/multiple-users-force-password-reset

3 years agoMerge branch 'failing-search-fixes' into 'develop'
rinpatch [Mon, 4 Nov 2019 16:28:55 +0000 (16:28 +0000)]
Merge branch 'failing-search-fixes' into 'develop'

User Search: Remove superfluous setweight and random test.

See merge request pleroma/pleroma!1935

3 years agoMerge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'
lain [Mon, 4 Nov 2019 15:59:36 +0000 (15:59 +0000)]
Merge branch 'add-direct-conversation-id-to-conversation-event' into 'develop'

Add `pleroma.direct_conversation_id` to the `conversation` event payload

See merge request pleroma/pleroma!1925

3 years agoUser Search: Remove superfluous setweight and random test.
lain [Mon, 4 Nov 2019 15:57:41 +0000 (16:57 +0100)]
User Search: Remove superfluous setweight and random test.

The test tested for a behavior that isn't actually enforced anymore.

3 years agoMastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation...
eugenijm [Thu, 31 Oct 2019 00:44:27 +0000 (03:44 +0300)]
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.

3 years agoMerge branch 'transmogrifier-test-errors' into 'develop'
lain [Mon, 4 Nov 2019 15:19:29 +0000 (15:19 +0000)]
Merge branch 'transmogrifier-test-errors' into 'develop'

capture test log where errors are expected

See merge request pleroma/pleroma!1915

3 years agoMerge branch 'missing-tesla-mocks' into 'develop'
lain [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
Merge branch 'missing-tesla-mocks' into 'develop'

add missing tesla mocks

See merge request pleroma/pleroma!1879

3 years agoadd missing tesla mocks
Steven Fuchs [Mon, 4 Nov 2019 15:18:32 +0000 (15:18 +0000)]
add missing tesla mocks

3 years agoMerge branch 'chore/update-fast-sanitize' into 'develop'
kaniini [Mon, 4 Nov 2019 14:52:56 +0000 (14:52 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'

mix: update fast_sanitize dependency to 1af67547

Closes #1372

See merge request pleroma/pleroma!1934

3 years agomix: update fast_sanitize dependency to 1af67547
Ariadne Conill [Mon, 4 Nov 2019 14:38:14 +0000 (08:38 -0600)]
mix: update fast_sanitize dependency to 1af67547

3 years agoMerge branch 'faster-user-deactivation' into 'develop'
kaniini [Mon, 4 Nov 2019 14:24:21 +0000 (14:24 +0000)]
Merge branch 'faster-user-deactivation' into 'develop'

User: Don't pull remote users follower count immediately after deactivating.

Closes #1369

See merge request pleroma/pleroma!1933

3 years agoMerge branch 'feature/store-statuses-data-inside-flag' into 'develop'
lain [Mon, 4 Nov 2019 14:11:44 +0000 (14:11 +0000)]
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'

Store status data inside flag activity

See merge request pleroma/pleroma!1849

3 years agoUser: Don't pull remote users follower count immediately after deactivating.
lain [Mon, 4 Nov 2019 13:36:54 +0000 (14:36 +0100)]
User: Don't pull remote users follower count immediately after deactivating.

The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.

Closes #1369

3 years agoMerge branch 'chore/update-fast-sanitize' into 'develop'
kaniini [Sun, 3 Nov 2019 22:00:50 +0000 (22:00 +0000)]
Merge branch 'chore/update-fast-sanitize' into 'develop'

update fast sanitize dependency

See merge request pleroma/pleroma!1932

3 years agoupdate fast sanitize dependency
Ariadne Conill [Sun, 3 Nov 2019 21:41:30 +0000 (15:41 -0600)]
update fast sanitize dependency

3 years agoMerge branch 'bugfix/streamer-follows' into 'develop'
rinpatch [Sun, 3 Nov 2019 17:09:57 +0000 (17:09 +0000)]
Merge branch 'bugfix/streamer-follows' into 'develop'

streamer: use direct object for filter checks when there is no valid child object in an activity

Closes #1291

See merge request pleroma/pleroma!1931

3 years agoMerge branch 'feature/omit-relay-user' into 'develop'
kaniini [Sun, 3 Nov 2019 16:19:27 +0000 (16:19 +0000)]
Merge branch 'feature/omit-relay-user' into 'develop'

AdminAPI: Omit relay user from users list

Closes #1349

See merge request pleroma/pleroma!1924

3 years agoMerge branch 'feature/fast_sanitize' into 'develop'
kaniini [Sun, 3 Nov 2019 16:18:19 +0000 (16:18 +0000)]
Merge branch 'feature/fast_sanitize' into 'develop'

Switching to FastSanitize

See merge request pleroma/pleroma!1916

3 years agostreamer: use direct object for filter checks when there is no valid child object...
Ariadne Conill [Sun, 3 Nov 2019 15:05:12 +0000 (09:05 -0600)]
streamer: use direct object for filter checks when there is no valid child object in an activity

We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291

3 years agoMerge branch 'fix/migration-schema' into 'develop'
Haelwenn [Sat, 2 Nov 2019 15:07:47 +0000 (15:07 +0000)]
Merge branch 'fix/migration-schema' into 'develop'

Fix bookmark migration using a query with a schema

See merge request pleroma/pleroma!1923

3 years agoBump fast_sanitize version
rinpatch [Fri, 1 Nov 2019 17:58:24 +0000 (20:58 +0300)]
Bump fast_sanitize version

3 years agoMerge branch 'fix/moderation-log-crash' into 'develop'
kaniini [Fri, 1 Nov 2019 17:56:20 +0000 (17:56 +0000)]
Merge branch 'fix/moderation-log-crash' into 'develop'

Fix moderation log crash

Closes #1345

See merge request pleroma/pleroma!1929

3 years agoUpdate docs
Maxim Filippov [Fri, 1 Nov 2019 17:26:52 +0000 (20:26 +0300)]
Update docs

3 years agoApply suggestion to CHANGELOG.md
Maxim Filippov [Fri, 1 Nov 2019 17:25:41 +0000 (17:25 +0000)]
Apply suggestion to CHANGELOG.md

3 years agoFix moderation log crash
Maxim Filippov [Fri, 1 Nov 2019 16:13:29 +0000 (19:13 +0300)]
Fix moderation log crash

3 years agoForce password reset for multiple users
Maxim Filippov [Fri, 1 Nov 2019 15:45:47 +0000 (18:45 +0300)]
Force password reset for multiple users

3 years agoUndo dialyzer fix
Maxim Filippov [Fri, 1 Nov 2019 12:14:43 +0000 (15:14 +0300)]
Undo dialyzer fix

3 years agoMerge branch 'fix-recipients-from-activity' into 'develop'
kaniini [Fri, 1 Nov 2019 12:06:44 +0000 (12:06 +0000)]
Merge branch 'fix-recipients-from-activity' into 'develop'

Fix duplicate recipients from activity

See merge request pleroma/pleroma!1921

3 years agoMerge branch 'refactor/db-add-defaults' into 'develop'
lain [Thu, 31 Oct 2019 13:34:57 +0000 (13:34 +0000)]
Merge branch 'refactor/db-add-defaults' into 'develop'

Set defaults to fields with NULL values

Closes #1358

See merge request pleroma/pleroma!1914

3 years agoFix count
Maxim Filippov [Thu, 31 Oct 2019 12:34:49 +0000 (15:34 +0300)]
Fix count

3 years agoAdminAPI: Omit relay user from users list
Maxim Filippov [Wed, 30 Oct 2019 23:26:02 +0000 (02:26 +0300)]
AdminAPI: Omit relay user from users list

3 years agoFix "the call ... will never return" warning
Maxim Filippov [Wed, 30 Oct 2019 23:25:15 +0000 (02:25 +0300)]
Fix "the call ... will never return" warning

3 years agoBump fast_sanitize dependency so this builds on more than just Linux
Mark Felder [Wed, 30 Oct 2019 22:57:08 +0000 (17:57 -0500)]
Bump fast_sanitize dependency so this builds on more than just Linux

3 years agoMerge branch 'develop' into feature/fast_sanitize
Mark Felder [Wed, 30 Oct 2019 22:51:15 +0000 (17:51 -0500)]
Merge branch 'develop' into feature/fast_sanitize

3 years agoRemove following column from the migrations
Roman Chvanikov [Wed, 30 Oct 2019 15:34:14 +0000 (18:34 +0300)]
Remove following column from the migrations

3 years agoUpdate test for get_recipients_from_activity
kPherox [Wed, 30 Oct 2019 11:14:07 +0000 (20:14 +0900)]
Update test for get_recipients_from_activity

3 years agoMerge branch 'fix/blocked-follows' into 'develop'
rinpatch [Wed, 30 Oct 2019 10:59:25 +0000 (10:59 +0000)]
Merge branch 'fix/blocked-follows' into 'develop'

Add a migration to fix blocked follows

Closes #1359

See merge request pleroma/pleroma!1922