akkoma
3 years agoMerge branch 'fix/twittercard-video-dimensions' into 'develop'
feld [Thu, 10 Jun 2021 15:03:58 +0000 (15:03 +0000)]
Merge branch 'fix/twittercard-video-dimensions' into 'develop'

Generate Twittercard/OGP metadata with correct dimensions

See merge request pleroma/pleroma!3456

3 years agoAdd note about video thumbnails for code spelunkers unfamiliar with Media Preview...
Mark Felder [Thu, 10 Jun 2021 14:56:43 +0000 (09:56 -0500)]
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy

3 years agoMerge branch 'cycles-ci' into 'develop'
feld [Wed, 9 Jun 2021 19:04:40 +0000 (19:04 +0000)]
Merge branch 'cycles-ci' into 'develop'

Prevent compile-time cycles in CI

See merge request pleroma/pleroma!3420

3 years agoFix compile cycle in Pleroma.Tests.AuthTestController
Alex Gleason [Wed, 9 Jun 2021 18:30:19 +0000 (13:30 -0500)]
Fix compile cycle in Pleroma.Tests.AuthTestController

3 years agoCycles CI: disable cache
Alex Gleason [Wed, 9 Jun 2021 18:12:33 +0000 (13:12 -0500)]
Cycles CI: disable cache

3 years agoCI: echo $MIX_ENV
Alex Gleason [Wed, 9 Jun 2021 18:08:24 +0000 (13:08 -0500)]
CI: echo $MIX_ENV

3 years agoAdd cycles test to .gitlab-ci.yml
Alex Gleason [Sun, 23 May 2021 23:31:07 +0000 (18:31 -0500)]
Add cycles test to .gitlab-ci.yml
Thank you @jb55@bitcoinhackers.org for the awk syntax

3 years agoMerge branch 'refactor/ingestion-activity-context' into 'develop'
feld [Wed, 9 Jun 2021 17:17:41 +0000 (17:17 +0000)]
Merge branch 'refactor/ingestion-activity-context' into 'develop'

ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing

See merge request pleroma/pleroma!3462

3 years agoMerge branch 'eblurhash-hex' into 'develop'
feld [Wed, 9 Jun 2021 17:08:37 +0000 (17:08 +0000)]
Merge branch 'eblurhash-hex' into 'develop'

Use eblurhash 1.1.0 from Hex

See merge request pleroma/pleroma!3464

3 years agoFormatting of the comment
Mark Felder [Wed, 9 Jun 2021 16:58:51 +0000 (11:58 -0500)]
Formatting of the comment

3 years agoAdd new Twittercard/OGP changes
Mark Felder [Wed, 9 Jun 2021 16:56:54 +0000 (11:56 -0500)]
Add new Twittercard/OGP changes

3 years agoTest that videos only get image thumbnails in OGP metadata when we can produce them...
Mark Felder [Wed, 9 Jun 2021 16:46:31 +0000 (11:46 -0500)]
Test that videos only get image thumbnails in OGP metadata when we can produce them with Preview Proxy

3 years agoCredo
Mark Felder [Wed, 9 Jun 2021 16:09:14 +0000 (11:09 -0500)]
Credo

3 years agoLint
Mark Felder [Wed, 9 Jun 2021 16:06:53 +0000 (11:06 -0500)]
Lint

3 years agoFix incorrectly ordered arguments to the function and not properly merging lists.
Mark Felder [Wed, 9 Jun 2021 16:05:24 +0000 (11:05 -0500)]
Fix incorrectly ordered arguments to the function and not properly merging lists.

3 years agoMetadata.Utils.attachment_url/1 was used in this test too
Mark Felder [Wed, 9 Jun 2021 15:06:44 +0000 (10:06 -0500)]
Metadata.Utils.attachment_url/1 was used in this test too

3 years agoAdd a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
Mark Felder [Wed, 9 Jun 2021 15:02:41 +0000 (10:02 -0500)]
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.

3 years agoRemove Metadata.Utils.attachment_url/1
Mark Felder [Wed, 9 Jun 2021 14:58:29 +0000 (09:58 -0500)]
Remove Metadata.Utils.attachment_url/1

This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.

3 years agoUse eblurhash 1.1.0 from Hex
Alex Gleason [Wed, 9 Jun 2021 14:28:22 +0000 (09:28 -0500)]
Use eblurhash 1.1.0 from Hex

3 years agoObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
Haelwenn (lanodan) Monnier [Wed, 9 Jun 2021 01:43:01 +0000 (03:43 +0200)]
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing

3 years agoMerge branch 'cycles-plug-deps' into 'develop'
Haelwenn [Wed, 9 Jun 2021 02:20:00 +0000 (02:20 +0000)]
Merge branch 'cycles-plug-deps' into 'develop'

Refactor skipped plugs into Pleroma.Web functions

See merge request pleroma/pleroma!3463

3 years agoMerge branch 'cycles-side-effects' into 'develop'
Haelwenn [Wed, 9 Jun 2021 01:54:38 +0000 (01:54 +0000)]
Merge branch 'cycles-side-effects' into 'develop'

Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects

See merge request pleroma/pleroma!3460

3 years agoMerge branch 'cycles-instances' into 'develop'
Haelwenn [Wed, 9 Jun 2021 01:53:31 +0000 (01:53 +0000)]
Merge branch 'cycles-instances' into 'develop'

Recompilation speedup: Switch to runtime deps in Pleroma.Instances

See merge request pleroma/pleroma!3459

3 years agoRefactor skipped plugs into Pleroma.Web functions
Alex Gleason [Wed, 9 Jun 2021 00:14:12 +0000 (19:14 -0500)]
Refactor skipped plugs into Pleroma.Web functions
Speeds up recompilation by reducing compile cycles

3 years agoSwitch to runtime deps in ActivityPub.SideEffects
Alex Gleason [Tue, 8 Jun 2021 23:18:25 +0000 (18:18 -0500)]
Switch to runtime deps in ActivityPub.SideEffects
Speeds up recompilation by reducing compile cycles

3 years agoSwitch to runtime deps in Pleroma.Instances
Alex Gleason [Tue, 8 Jun 2021 23:03:21 +0000 (18:03 -0500)]
Switch to runtime deps in Pleroma.Instances
Speeds up recompilation by limiting compile cycles

3 years agoSwitch OGP default type from "website" to "article"
Mark Felder [Tue, 8 Jun 2021 22:14:30 +0000 (17:14 -0500)]
Switch OGP default type from "website" to "article"

This is what Mastodon uses and might fix some link preview bugs I've encountered

3 years agoMerge branch 'cycles-config-loader-redux' into 'develop'
feld [Tue, 8 Jun 2021 22:08:37 +0000 (22:08 +0000)]
Merge branch 'cycles-config-loader-redux' into 'develop'

Recompilation speedup: Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1

See merge request pleroma/pleroma!3458

3 years agoMerge branch 'cycles-user-view' into 'develop'
feld [Tue, 8 Jun 2021 22:07:25 +0000 (22:07 +0000)]
Merge branch 'cycles-user-view' into 'develop'

Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep

See merge request pleroma/pleroma!3457

3 years agoSet the correct height/width if the data is available when generating opengraph metadata
Mark Felder [Tue, 8 Jun 2021 21:58:33 +0000 (16:58 -0500)]
Set the correct height/width if the data is available when generating opengraph metadata

3 years agoCreate AdminAPI.UserView to avoid compile-time dep
Alex Gleason [Tue, 8 Jun 2021 20:58:19 +0000 (15:58 -0500)]
Create AdminAPI.UserView to avoid compile-time dep
Speeds up recompilation

3 years agoOnly use fallback for videos and only add this metadata for images if we really have it.
Mark Felder [Tue, 8 Jun 2021 21:31:12 +0000 (16:31 -0500)]
Only use fallback for videos and only add this metadata for images if we really have it.

3 years agoTwittercard metadata for images should also include dimensions if available
Mark Felder [Tue, 8 Jun 2021 21:19:12 +0000 (16:19 -0500)]
Twittercard metadata for images should also include dimensions if available

3 years agoIgnore runtime deps in Pleroma.Config.Loader with Module.concat/1
Alex Gleason [Tue, 8 Jun 2021 21:07:51 +0000 (16:07 -0500)]
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
Speeds up recompilation

3 years agoSet the correct height/width if the data is available when generating twittercard...
Mark Felder [Tue, 8 Jun 2021 20:59:55 +0000 (15:59 -0500)]
Set the correct height/width if the data is available when generating twittercard metadata

3 years agoMerge branch 'metadata-for-all' into 'develop'
feld [Tue, 8 Jun 2021 20:30:55 +0000 (20:30 +0000)]
Merge branch 'metadata-for-all' into 'develop'

Support metadata for video files too

See merge request pleroma/pleroma!3441

3 years agoBlurhash varies slightly by computer generating it, so just validate it wasn't nil
Mark Felder [Tue, 8 Jun 2021 19:49:57 +0000 (14:49 -0500)]
Blurhash varies slightly by computer generating it, so just validate it wasn't nil

3 years agoMerge branch 'improve-og-embed' into 'develop'
feld [Tue, 8 Jun 2021 19:26:17 +0000 (19:26 +0000)]
Merge branch 'improve-og-embed' into 'develop'

Improve opengraph embeds

See merge request pleroma/pleroma!3442

3 years agoUpdate test names and verify blurhash is correctly generated for images
Mark Felder [Tue, 8 Jun 2021 19:05:13 +0000 (14:05 -0500)]
Update test names and verify blurhash is correctly generated for images

3 years agoAdd test for AnalyzeMetadata upload filter fetching dimensions from a video
Mark Felder [Tue, 8 Jun 2021 19:02:56 +0000 (14:02 -0500)]
Add test for AnalyzeMetadata upload filter fetching dimensions from a video

3 years agoMerge branch 'cycles-params' into 'develop'
feld [Tue, 8 Jun 2021 18:06:44 +0000 (18:06 +0000)]
Merge branch 'cycles-params' into 'develop'

Recompilation speedup: break out Pleroma.Web.Params.truthy_param?/1 from ControllerHelper

See merge request pleroma/pleroma!3449

3 years agoUpdate scope of AnalyzeMetadata features
Mark Felder [Tue, 8 Jun 2021 17:56:03 +0000 (12:56 -0500)]
Update scope of AnalyzeMetadata features

3 years agoSupport metadata for video files too
Mark Felder [Thu, 3 Jun 2021 21:58:18 +0000 (16:58 -0500)]
Support metadata for video files too

3 years agoFix order of Pleroma.Web.Utils.Params aliases
Alex Gleason [Mon, 7 Jun 2021 21:45:33 +0000 (16:45 -0500)]
Fix order of Pleroma.Web.Utils.Params aliases

3 years agoPleroma.Web.Params --> Pleroma.Web.Utils.Params
Alex Gleason [Mon, 7 Jun 2021 21:01:26 +0000 (16:01 -0500)]
Pleroma.Web.Params --> Pleroma.Web.Utils.Params

3 years agoPleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
Alex Gleason [Sat, 22 May 2021 16:41:55 +0000 (11:41 -0500)]
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex

3 years agoMerge branch 'cycles-uploads' into 'develop'
feld [Tue, 8 Jun 2021 17:49:24 +0000 (17:49 +0000)]
Merge branch 'cycles-uploads' into 'develop'

Recompilation speedup: use generic types in @spec in Upload.Filter

See merge request pleroma/pleroma!3453

3 years agoMerge branch 'cycles-authenticator' into 'develop'
feld [Tue, 8 Jun 2021 17:45:10 +0000 (17:45 +0000)]
Merge branch 'cycles-authenticator' into 'develop'

Recompilation speedup: create WrapperAuthenticator and simplify Authenticator behaviour

See merge request pleroma/pleroma!3454

3 years agoCreate WrapperAuthenticator and simplify Authenticator behaviour
Alex Gleason [Mon, 7 Jun 2021 23:07:54 +0000 (18:07 -0500)]
Create WrapperAuthenticator and simplify Authenticator behaviour
Speeds up recompilation by reducing compile-time cycles

3 years agoUpload.Filter: use generic types in @spec
Alex Gleason [Mon, 7 Jun 2021 22:07:40 +0000 (17:07 -0500)]
Upload.Filter: use generic types in @spec
Speeds up recompilation by reducing compile-time deps

3 years agoMerge branch 'fix/config-test-warning' into 'develop'
feld [Mon, 7 Jun 2021 21:22:23 +0000 (21:22 +0000)]
Merge branch 'fix/config-test-warning' into 'develop'

Fix test warnings

See merge request pleroma/pleroma!3452

3 years agoMerge branch 'pleromapi' into 'develop'
feld [Mon, 7 Jun 2021 21:21:35 +0000 (21:21 +0000)]
Merge branch 'pleromapi' into 'develop'

Add Raspberry Pi install instructions

See merge request pleroma/pleroma!3430

3 years agoMerge branch 'cycles-guard' into 'develop'
feld [Mon, 7 Jun 2021 21:21:10 +0000 (21:21 +0000)]
Merge branch 'cycles-guard' into 'develop'

Recompilation speedup: Put custom guards in Web.Utils.Guards

See merge request pleroma/pleroma!3451

3 years agoChannel name was incorrect. We left it as chat:public for backwards compatibility.
Mark Felder [Mon, 7 Jun 2021 21:10:24 +0000 (16:10 -0500)]
Channel name was incorrect. We left it as chat:public for backwards compatibility.

3 years agoTest was named incorrectly and did not execute
Mark Felder [Mon, 7 Jun 2021 21:09:47 +0000 (16:09 -0500)]
Test was named incorrectly and did not execute

3 years agoFix test warnings
Mark Felder [Mon, 7 Jun 2021 21:06:53 +0000 (16:06 -0500)]
Fix test warnings

3 years agoPut custom guards in Web.Utils.Guards
Alex Gleason [Mon, 7 Jun 2021 20:51:52 +0000 (15:51 -0500)]
Put custom guards in Web.Utils.Guards
Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search

3 years agoFormatting
Mark Felder [Mon, 7 Jun 2021 20:47:50 +0000 (15:47 -0500)]
Formatting

3 years agoMerge branch 'fix/prune-hashtags' into 'develop'
feld [Mon, 7 Jun 2021 20:11:45 +0000 (20:11 +0000)]
Merge branch 'fix/prune-hashtags' into 'develop'

get prune_objects to work again

See merge request pleroma/pleroma!3397

3 years agoMerge branch 'cycles-mrf-policy' into 'develop'
feld [Mon, 7 Jun 2021 20:10:20 +0000 (20:10 +0000)]
Merge branch 'cycles-mrf-policy' into 'develop'

Recompilation speedup: create MRF.Policy behaviour separate from MRF module

See merge request pleroma/pleroma!3450

3 years agoUpdate CHANGELOG.md
feld [Mon, 7 Jun 2021 20:07:59 +0000 (20:07 +0000)]
Update CHANGELOG.md

3 years agoUpdate CHANGELOG.md
feld [Mon, 7 Jun 2021 20:07:27 +0000 (20:07 +0000)]
Update CHANGELOG.md

3 years agoMerge branch 'develop' into 'fix/prune-hashtags'
feld [Mon, 7 Jun 2021 20:06:36 +0000 (20:06 +0000)]
Merge branch 'develop' into 'fix/prune-hashtags'

# Conflicts:
#   CHANGELOG.md

3 years agoUpdate CHANGELOG.md
feld [Mon, 7 Jun 2021 20:05:18 +0000 (20:05 +0000)]
Update CHANGELOG.md

3 years agoUpdate CHANGELOG.md
feld [Mon, 7 Jun 2021 20:04:27 +0000 (20:04 +0000)]
Update CHANGELOG.md

3 years agoUpdate lib/mix/tasks/pleroma/database.ex
feld [Mon, 7 Jun 2021 20:02:28 +0000 (20:02 +0000)]
Update lib/mix/tasks/pleroma/database.ex

3 years agoMerge branch 'fix/plug_parser_multipart' into 'develop'
feld [Mon, 7 Jun 2021 19:58:37 +0000 (19:58 +0000)]
Merge branch 'fix/plug_parser_multipart' into 'develop'

web endpoint: Use Config.get directly instead of a tuple

See merge request pleroma/pleroma!3445

3 years agoFix MRF.config_descriptions/0
Alex Gleason [Mon, 7 Jun 2021 19:51:25 +0000 (14:51 -0500)]
Fix MRF.config_descriptions/0

3 years agoMRF: create MRF.Policy behaviour separate from MRF module
Alex Gleason [Mon, 7 Jun 2021 19:22:08 +0000 (14:22 -0500)]
MRF: create MRF.Policy behaviour separate from MRF module
Speeds up recompilation by reducing compile-time deps

3 years agoMerge branch 'notification-settings-docs-fix' into 'develop'
feld [Mon, 7 Jun 2021 17:03:51 +0000 (17:03 +0000)]
Merge branch 'notification-settings-docs-fix' into 'develop'

Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings

See merge request pleroma/pleroma!3448

3 years agoMerge branch 'cycles-reverse-proxy' into 'develop'
feld [Mon, 7 Jun 2021 17:03:19 +0000 (17:03 +0000)]
Merge branch 'cycles-reverse-proxy' into 'develop'

Recompilation speedup: create Dynamic client for ReverseProxy

See merge request pleroma/pleroma!3440

3 years agoDocs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings
Alex Gleason [Mon, 7 Jun 2021 16:18:14 +0000 (11:18 -0500)]
Docs: /api/v1/pleroma/notification_settings --> /api/pleroma/notification_settings

3 years agoMerge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
Alex Gleason [Sat, 5 Jun 2021 02:12:37 +0000 (21:12 -0500)]
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy

3 years agoReverseProxy: create Client.Wrapper to call client from config
Alex Gleason [Wed, 2 Jun 2021 21:34:32 +0000 (16:34 -0500)]
ReverseProxy: create Client.Wrapper to call client from config
Speeds up recompilation by reducing compile-time cycles

3 years agoMerge branch 'chore/otp24-changelog' into 'develop'
feld [Fri, 4 Jun 2021 20:57:28 +0000 (20:57 +0000)]
Merge branch 'chore/otp24-changelog' into 'develop'

Document OTP 24 support

See merge request pleroma/pleroma!3447

3 years agoMerge branch 'fix/clear_config_warning' into 'develop'
feld [Fri, 4 Jun 2021 20:55:21 +0000 (20:55 +0000)]
Merge branch 'fix/clear_config_warning' into 'develop'

Fix warning for misuse of clear_config/2

See merge request pleroma/pleroma!3446

3 years agoDocument OTP 24 support so we remember to add it to the official release notes /...
Mark Felder [Fri, 4 Jun 2021 20:50:10 +0000 (15:50 -0500)]
Document OTP 24 support so we remember to add it to the official release notes / announcement

3 years agoFix warning for misuse of clear_config/2
Mark Felder [Fri, 4 Jun 2021 20:35:56 +0000 (15:35 -0500)]
Fix warning for misuse of clear_config/2

The old warning message was producing an improperly formatted suggestion.

3 years agoMerge branch 'tests/openapi-everywhere' into 'develop'
Haelwenn [Fri, 4 Jun 2021 18:53:09 +0000 (18:53 +0000)]
Merge branch 'tests/openapi-everywhere' into 'develop'

Put OpenAPI ~everywhere in tests

See merge request pleroma/pleroma!3324

3 years agoweb endpoint: Use Config.get directly instead of a tuple
Haelwenn (lanodan) Monnier [Fri, 4 Jun 2021 17:57:48 +0000 (19:57 +0200)]
web endpoint: Use Config.get directly instead of a tuple

Fixes a lot of warnings like the following while running the testsuite:

  warning: passing a {module, function, args} tuple to Plug.Parsers.MULTIPART is deprecated. Please see Plug.Parsers.MULTIPART module docs for better approaches to configuration

This might mean no more dynamic configuration but there seems to be the same limitation two lines underneath anyway.

3 years agoMerge branch 'fix/missing-deprecation' into 'develop'
feld [Fri, 4 Jun 2021 17:37:30 +0000 (17:37 +0000)]
Merge branch 'fix/missing-deprecation' into 'develop'

Add missing deprecation warning left out of !2842

See merge request pleroma/pleroma!3444

3 years agoMerge branch 'bugfix/erlang-24' into 'develop'
feld [Fri, 4 Jun 2021 17:36:36 +0000 (17:36 +0000)]
Merge branch 'bugfix/erlang-24' into 'develop'

Erlang 24 compatibility

Closes #2647

See merge request pleroma/pleroma!3405

3 years agoAdd missing deprecation warning left out of !2842
Mark Felder [Fri, 4 Jun 2021 17:30:10 +0000 (12:30 -0500)]
Add missing deprecation warning left out of !2842

3 years agoImprove opengraph embeds
io [Fri, 4 Jun 2021 04:15:54 +0000 (04:15 +0000)]
Improve opengraph embeds

This brings them more in line with Mastodon.
- Deduplicates display name from the title and content
- Removes arbitrary limits on the size of the embedded image
- Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.

3 years agoMIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:41:31 +0000 (10:41 +0200)]
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []

Since mime 1.6.0:

  warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead

As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43

3 years agorequest_builder_test: mode :read got removed
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:14:12 +0000 (10:14 +0200)]
request_builder_test: mode :read got removed

3 years agofactory: Fix article_factory
Haelwenn (lanodan) Monnier [Mon, 31 May 2021 08:06:06 +0000 (10:06 +0200)]
factory: Fix article_factory

3 years agomix: Update pot to ~> 1.0
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 16:04:13 +0000 (18:04 +0200)]
mix: Update pot to ~> 1.0

3 years agomix.exs: Apply OTP24 fixes to web_push_encryption
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 15:55:40 +0000 (17:55 +0200)]
mix.exs: Apply OTP24 fixes to web_push_encryption

3 years agomix: Update dependencies
Haelwenn (lanodan) Monnier [Sat, 22 May 2021 15:48:35 +0000 (17:48 +0200)]
mix: Update dependencies

3 years agomedia_proxy: switch from :crypto.hmac to :crypto.mac
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 11:15:02 +0000 (13:15 +0200)]
media_proxy: switch from :crypto.hmac to :crypto.mac

3 years agomix: Switch hackney & gun to releases
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 11:08:00 +0000 (13:08 +0200)]
mix: Switch hackney & gun to releases

3 years agoUpdate all dependencies
Haelwenn (lanodan) Monnier [Sat, 15 May 2021 10:40:37 +0000 (12:40 +0200)]
Update all dependencies

3 years agoMerge branch 'chore/rename-chat' into 'develop'
Haelwenn [Thu, 3 Jun 2021 15:52:16 +0000 (15:52 +0000)]
Merge branch 'chore/rename-chat' into 'develop'

Rename the non-federating Chat feature to Shout

See merge request pleroma/pleroma!2842

3 years agoMerge branch 'chore/cicd_skip_nonsense' into 'develop'
rinpatch [Wed, 2 Jun 2021 17:18:10 +0000 (17:18 +0000)]
Merge branch 'chore/cicd_skip_nonsense' into 'develop'

Skip CI/CD automatically under certain conditions

See merge request pleroma/pleroma!3439

3 years agoDon't generate new specs unless they've changed.
Mark Felder [Wed, 2 Jun 2021 17:09:41 +0000 (12:09 -0500)]
Don't generate new specs unless they've changed.

3 years agoSkip build, test, analysis/lint when we don't make code changes
Mark Felder [Wed, 2 Jun 2021 17:00:45 +0000 (12:00 -0500)]
Skip build, test, analysis/lint when we don't make code changes

3 years agoMerge branch 'Snow-develop-patch-01683' into 'develop'
feld [Wed, 2 Jun 2021 16:53:37 +0000 (16:53 +0000)]
Merge branch 'Snow-develop-patch-01683' into 'develop'

Update docs/description for allow_relay

See merge request pleroma/pleroma!3438

3 years agoUpdate wording for relays in docs and config description
Mark Felder [Wed, 2 Jun 2021 16:26:26 +0000 (11:26 -0500)]
Update wording for relays in docs and config description

3 years agoFormatting
Mark Felder [Wed, 2 Jun 2021 16:21:04 +0000 (11:21 -0500)]
Formatting