akkoma
4 years agoMerge branch 'fix/openapi-form-mimetype' into 'develop'
rinpatch [Tue, 14 Apr 2020 22:01:24 +0000 (22:01 +0000)]
Merge branch 'fix/openapi-form-mimetype' into 'develop'

openapi: add application/x-www-form-urlencoded to body types

Closes #1683

See merge request pleroma/pleroma!2387

4 years agoopenapi: add application/x-www-form-urlencoded to body types
rinpatch [Tue, 14 Apr 2020 21:49:21 +0000 (00:49 +0300)]
openapi: add application/x-www-form-urlencoded to body types

Closes #1683

4 years agoMerge branch 'fix/richmedia-oban-error' into 'develop'
feld [Tue, 14 Apr 2020 17:05:17 +0000 (17:05 +0000)]
Merge branch 'fix/richmedia-oban-error' into 'develop'

Attempt at fixing Oban not receiving :ok from RichMediaHelper job

Closes #1684

See merge request pleroma/pleroma!2377

4 years agoFix Oban not receiving :ok from RichMediaHelper job
Mark Felder [Tue, 14 Apr 2020 16:43:53 +0000 (11:43 -0500)]
Fix Oban not receiving :ok from RichMediaHelper job

4 years agoMerge branch 'revert-60cc7d6c' into 'develop'
lain [Tue, 14 Apr 2020 16:32:34 +0000 (16:32 +0000)]
Merge branch 'revert-60cc7d6c' into 'develop'

Revert "Merge branch 'issue/1276' into 'develop'"

See merge request pleroma/pleroma!2384

4 years agoRevert "Merge branch 'issue/1276' into 'develop'"
lain [Tue, 14 Apr 2020 16:32:22 +0000 (16:32 +0000)]
Revert "Merge branch 'issue/1276' into 'develop'"

This reverts merge request !1877

4 years agoMerge branch 'revert-13a7105b' into 'develop'
lain [Tue, 14 Apr 2020 16:31:41 +0000 (16:31 +0000)]
Merge branch 'revert-13a7105b' into 'develop'

Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383

4 years agoRevert "Merge branch 'marker-update-fix' into 'develop'"
lain [Tue, 14 Apr 2020 16:31:30 +0000 (16:31 +0000)]
Revert "Merge branch 'marker-update-fix' into 'develop'"

This reverts merge request !2380

4 years agoMerge branch 'logger-configuration' into 'develop'
feld [Tue, 14 Apr 2020 15:11:25 +0000 (15:11 +0000)]
Merge branch 'logger-configuration' into 'develop'

Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365

4 years agoMerge branch 'marker-update-fix' into 'develop'
lain [Tue, 14 Apr 2020 13:17:44 +0000 (13:17 +0000)]
Merge branch 'marker-update-fix' into 'develop'

Marker update migration: Don't try to update virtual field.

See merge request pleroma/pleroma!2380

4 years agoMerge branch 'chore/spelling' into 'develop'
lain [Tue, 14 Apr 2020 13:07:57 +0000 (13:07 +0000)]
Merge branch 'chore/spelling' into 'develop'

Fix spelling in log message

See merge request pleroma/pleroma!2378

4 years agoMarker update migration: Don't try to update virtual field.
lain [Tue, 14 Apr 2020 13:06:09 +0000 (15:06 +0200)]
Marker update migration: Don't try to update virtual field.

4 years agoMerge branch 'fix/issue_1679' into 'develop'
lain [Tue, 14 Apr 2020 11:08:33 +0000 (11:08 +0000)]
Merge branch 'fix/issue_1679' into 'develop'

[#1679] fixed  logs

See merge request pleroma/pleroma!2379

4 years agoMerge branch 'issue/1276' into 'develop'
Haelwenn [Tue, 14 Apr 2020 06:38:56 +0000 (06:38 +0000)]
Merge branch 'issue/1276' into 'develop'

[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877

4 years agofix logger message
Maksim Pechnikov [Tue, 14 Apr 2020 05:43:47 +0000 (08:43 +0300)]
fix logger message

4 years agoFix spelling
Mark Felder [Mon, 13 Apr 2020 22:04:43 +0000 (17:04 -0500)]
Fix spelling

4 years agoMerge branch 'openapi/domain-blocks' into 'develop'
rinpatch [Mon, 13 Apr 2020 20:04:49 +0000 (20:04 +0000)]
Merge branch 'openapi/domain-blocks' into 'develop'

Add OpenAPI spec for DomainBlockController

See merge request pleroma/pleroma!2376

4 years agoAdd OpenAPI spec for DomainBlockController
Egor Kislitsyn [Mon, 13 Apr 2020 18:44:52 +0000 (22:44 +0400)]
Add OpenAPI spec for DomainBlockController

4 years agoMerge branch 'develop' into issue/1276
Maksim Pechnikov [Mon, 13 Apr 2020 18:19:27 +0000 (21:19 +0300)]
Merge branch 'develop' into issue/1276

4 years agoMerge branch 'output-of-relationships-in-statuses' into 'develop'
rinpatch [Mon, 13 Apr 2020 13:05:40 +0000 (13:05 +0000)]
Merge branch 'output-of-relationships-in-statuses' into 'develop'

Ability to control the output of AccountView.pleroma.relationship in statuses / notifications

See merge request pleroma/pleroma!2342

4 years ago[#2342] Removed description.exs entry for temporary configuration option.
Ivan Tashkinov [Mon, 13 Apr 2020 12:38:50 +0000 (15:38 +0300)]
[#2342] Removed description.exs entry for temporary configuration option.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:51 +0000 (09:16 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses

4 years ago[#2342] Removed changelog entry for temporary configuration option.
Ivan Tashkinov [Mon, 13 Apr 2020 06:16:35 +0000 (09:16 +0300)]
[#2342] Removed changelog entry for temporary configuration option.

4 years agochangelog entry
Alexander Strizhakov [Mon, 13 Apr 2020 05:59:06 +0000 (08:59 +0300)]
changelog entry

4 years agofix for logger configuration through admin-fe
Alexander Strizhakov [Fri, 10 Apr 2020 11:42:52 +0000 (14:42 +0300)]
fix for logger configuration through admin-fe

4 years agoMerge branch 'fix/mix-tasks-failing-otp' into 'develop'
rinpatch [Sun, 12 Apr 2020 16:00:15 +0000 (16:00 +0000)]
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'

Fix mix tasks failing on OTP releases

Closes #1678

See merge request pleroma/pleroma!2369

4 years agoFix mix tasks failing on OTP releases
rinpatch [Sun, 12 Apr 2020 15:49:31 +0000 (18:49 +0300)]
Fix mix tasks failing on OTP releases

No idea why this was even added.
Closes #1678

4 years agoMerge branch 'following-relationships-optimizations' into 'develop'
rinpatch [Sat, 11 Apr 2020 19:46:04 +0000 (19:46 +0000)]
Merge branch 'following-relationships-optimizations' into 'develop'

FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332

4 years agoMerge branch 'support/update_oban' into 'develop'
rinpatch [Sat, 11 Apr 2020 10:04:02 +0000 (10:04 +0000)]
Merge branch 'support/update_oban' into 'develop'

[#1555] updated the Oban package

See merge request pleroma/pleroma!2346

4 years agofix Oban migration
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:50 +0000 (21:27 +0300)]
fix Oban migration

4 years agoMerge branch 'develop' into support/update_oban
Maksim Pechnikov [Fri, 10 Apr 2020 18:27:41 +0000 (21:27 +0300)]
Merge branch 'develop' into support/update_oban

4 years agoMerge branch 'chore/changelog-organization' into 'develop'
feld [Fri, 10 Apr 2020 16:56:41 +0000 (16:56 +0000)]
Merge branch 'chore/changelog-organization' into 'develop'

Add a section for changelog entries that pertain to the next patch release.

See merge request pleroma/pleroma!2366

4 years agoAdd a section for changelog entries that pertain to the next patch release.
Mark Felder [Fri, 10 Apr 2020 16:37:02 +0000 (11:37 -0500)]
Add a section for changelog entries that pertain to the next patch release.

This will make it easier to keep changelogs synced between develop and stable branches.

4 years agoMerge branch 'fix/support-conversations-pagination' into 'develop'
Haelwenn [Fri, 10 Apr 2020 12:12:49 +0000 (12:12 +0000)]
Merge branch 'fix/support-conversations-pagination' into 'develop'

Support pagination in conversations

See merge request pleroma/pleroma!2329

4 years agoMerge branch 'develop' into fix/support-conversations-pagination
Egor Kislitsyn [Fri, 10 Apr 2020 10:18:57 +0000 (14:18 +0400)]
Merge branch 'develop' into fix/support-conversations-pagination

4 years agoMerge branch 'chore/fix-changelog' into 'develop'
Haelwenn [Fri, 10 Apr 2020 05:15:11 +0000 (05:15 +0000)]
Merge branch 'chore/fix-changelog' into 'develop'

Chore/fix changelog

See merge request pleroma/pleroma!2364

4 years agoMerge branch 'bugfix/apc2s_upload_activity' into 'develop'
Haelwenn [Fri, 10 Apr 2020 04:31:13 +0000 (04:31 +0000)]
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'

bugfix: AP C2S activity with attachments

See merge request pleroma/pleroma!2316

4 years agoMerge branch 'develop' into support/update_oban
Maksim Pechnikov [Fri, 10 Apr 2020 04:09:28 +0000 (07:09 +0300)]
Merge branch 'develop' into support/update_oban

4 years agoMerge branch 'fix-otp-version-file-in-docker' into 'develop'
Haelwenn [Fri, 10 Apr 2020 03:55:54 +0000 (03:55 +0000)]
Merge branch 'fix-otp-version-file-in-docker' into 'develop'

Create OTP_VERSION file by `mix release`

See merge request pleroma/pleroma!2362

4 years agoRename function
kPherox [Thu, 9 Apr 2020 23:19:41 +0000 (23:19 +0000)]
Rename function

4 years agoCHANGELOG.md: update 2.0.2 release date
rinpatch [Tue, 7 Apr 2020 21:39:55 +0000 (00:39 +0300)]
CHANGELOG.md: update 2.0.2 release date

4 years agoCHANGELOG.md: add 2.0.2 update notes
rinpatch [Tue, 7 Apr 2020 21:38:48 +0000 (00:38 +0300)]
CHANGELOG.md: add 2.0.2 update notes

4 years agoCHANGELOG.md: add entries for funkwhale-related changes
rinpatch [Thu, 2 Apr 2020 20:37:14 +0000 (23:37 +0300)]
CHANGELOG.md: add entries for funkwhale-related changes

4 years agoCHANGELOG.md: Add 2.0.2 entry
rinpatch [Tue, 31 Mar 2020 10:59:26 +0000 (13:59 +0300)]
CHANGELOG.md: Add 2.0.2 entry

4 years agoCHANGELOG.md: Add upgrade notes for 2.0.1
rinpatch [Sun, 15 Mar 2020 21:50:03 +0000 (00:50 +0300)]
CHANGELOG.md: Add upgrade notes for 2.0.1

4 years agochangelog.md: add 2.0.1 entry
rinpatch [Sun, 15 Mar 2020 14:26:58 +0000 (17:26 +0300)]
changelog.md: add 2.0.1 entry

4 years agoMerge branch 'update-changelog' into 'develop'
rinpatch [Thu, 9 Apr 2020 19:49:10 +0000 (19:49 +0000)]
Merge branch 'update-changelog' into 'develop'

Update CHANGELOG

See merge request pleroma/pleroma!2363

4 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 9 Apr 2020 19:36:17 +0000 (23:36 +0400)]
Update CHANGELOG

4 years agoMerge branch 'notifications-dismiss-api' into 'develop'
feld [Thu, 9 Apr 2020 19:32:11 +0000 (19:32 +0000)]
Merge branch 'notifications-dismiss-api' into 'develop'

Add `/api/v1/notifications/:id/dismiss` endpoint

Closes #1673

See merge request pleroma/pleroma!2360

4 years agoCreate OTP_VERSION file by `mix release`
kPherox [Thu, 9 Apr 2020 15:19:09 +0000 (00:19 +0900)]
Create OTP_VERSION file by `mix release`

4 years agoMerge branch 'fix-otp-version-file-in-docker' into 'develop'
lain [Thu, 9 Apr 2020 14:12:08 +0000 (14:12 +0000)]
Merge branch 'fix-otp-version-file-in-docker' into 'develop'

Add OTP_VERSION file to docker

Closes #1662

See merge request pleroma/pleroma!2361

4 years agoAdd `/api/v1/notifications/:id/dismiss` endpoint
Egor Kislitsyn [Thu, 9 Apr 2020 13:08:43 +0000 (17:08 +0400)]
Add `/api/v1/notifications/:id/dismiss` endpoint

4 years agoFix OTP_VERSION file in docker
kPherox [Thu, 9 Apr 2020 12:16:29 +0000 (21:16 +0900)]
Fix OTP_VERSION file in docker

4 years agoMerge branch 'fix/1658-invite-send' into 'develop'
lain [Thu, 9 Apr 2020 10:42:43 +0000 (10:42 +0000)]
Merge branch 'fix/1658-invite-send' into 'develop'

Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344

4 years agotypo fix
Alexander Strizhakov [Thu, 9 Apr 2020 10:28:54 +0000 (13:28 +0300)]
typo fix

4 years agoApply suggestion to test/web/admin_api/admin_api_controller_test.exs
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:50 +0000 (10:17 +0000)]
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs

4 years agoApply suggestion to test/web/admin_api/admin_api_controller_test.exs
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:44 +0000 (10:17 +0000)]
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs

4 years agoApply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:36 +0000 (10:17 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex

4 years agoApply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:31 +0000 (10:17 +0000)]
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex

4 years agoApply suggestion to docs/API/admin_api.md
Alexander Strizhakov [Thu, 9 Apr 2020 10:17:24 +0000 (10:17 +0000)]
Apply suggestion to docs/API/admin_api.md

4 years agoMerge branch 'open-api' into 'develop'
lain [Thu, 9 Apr 2020 09:48:56 +0000 (09:48 +0000)]
Merge branch 'open-api' into 'develop'

Add OpenAPI

Closes pleroma-meta#19

See merge request pleroma/pleroma!2345

4 years agoMerge branch 'formatter-html-safe' into 'develop'
lain [Thu, 9 Apr 2020 09:47:07 +0000 (09:47 +0000)]
Merge branch 'formatter-html-safe' into 'develop'

formatter.ex: Use Phoenix.HTML for mention/hashtag generation

See merge request pleroma/pleroma!2357

4 years agoMerge branch 'changelog-update' into 'develop'
Haelwenn [Thu, 9 Apr 2020 05:11:10 +0000 (05:11 +0000)]
Merge branch 'changelog-update' into 'develop'

No changelog entry - bug fixed only in develop

See merge request pleroma/pleroma!2359

4 years agono changelog entry - bug fixed only in develop
Alexander Strizhakov [Thu, 9 Apr 2020 05:03:21 +0000 (08:03 +0300)]
no changelog entry - bug fixed only in develop

4 years agoMerge branch 'bugfix/objectid_validator' into 'develop'
Haelwenn [Thu, 9 Apr 2020 02:43:03 +0000 (02:43 +0000)]
Merge branch 'bugfix/objectid_validator' into 'develop'

ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}

See merge request pleroma/pleroma!2358

4 years agoObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
Haelwenn (lanodan) Monnier [Thu, 9 Apr 2020 02:36:39 +0000 (04:36 +0200)]
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}

4 years agoformatter.ex: Use Phoenix.HTML for mention/hashtag generation
rinpatch [Wed, 8 Apr 2020 19:58:31 +0000 (22:58 +0300)]
formatter.ex: Use Phoenix.HTML for mention/hashtag generation

Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.

4 years agoMerge branch 'gun-pool-fix' into 'develop'
feld [Wed, 8 Apr 2020 17:13:54 +0000 (17:13 +0000)]
Merge branch 'gun-pool-fix' into 'develop'

Fix for gun connections pool

Closes #1669 and #1664

See merge request pleroma/pleroma!2356

4 years agofix for gun connections pool
Alexander Strizhakov [Wed, 8 Apr 2020 15:46:01 +0000 (18:46 +0300)]
fix for gun connections pool

4 years agoMerge branch 'fix-auto-link-for-profile-fields' into 'develop'
rinpatch [Tue, 7 Apr 2020 11:41:10 +0000 (11:41 +0000)]
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'

Use Pleroma.Formatter.linkify/2 instead

See merge request pleroma/pleroma!2352

4 years agoMerge branch 'develop' into issue/1276
Maksim Pechnikov [Tue, 7 Apr 2020 11:09:43 +0000 (14:09 +0300)]
Merge branch 'develop' into issue/1276

4 years agoApply suggestion to test/web/mastodon_api/controllers/account_controller/update_crede...
kPherox [Tue, 7 Apr 2020 08:44:53 +0000 (08:44 +0000)]
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs

4 years agoAdd Pleroma.Web.ApiSpec.Helpers
Egor Kislitsyn [Fri, 3 Apr 2020 18:52:25 +0000 (22:52 +0400)]
Add Pleroma.Web.ApiSpec.Helpers

4 years agoMerge branch 'featureflag/emoji_reactions' into 'develop'
lain [Mon, 6 Apr 2020 12:51:35 +0000 (12:51 +0000)]
Merge branch 'featureflag/emoji_reactions' into 'develop'

Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313

4 years agoMerge branch 'improving-test-coverage' into 'develop'
lain [Mon, 6 Apr 2020 12:49:17 +0000 (12:49 +0000)]
Merge branch 'improving-test-coverage' into 'develop'

Tests for emoji mix task

See merge request pleroma/pleroma!2350

4 years agoMerge branch 'remake-remodel-2' into 'develop'
lain [Mon, 6 Apr 2020 11:59:01 +0000 (11:59 +0000)]
Merge branch 'remake-remodel-2' into 'develop'

Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315

4 years agoObjectID Validator: Refactor.
lain [Mon, 6 Apr 2020 11:53:24 +0000 (13:53 +0200)]
ObjectID Validator: Refactor.

4 years agoTransmogrifier: Refactoring / Renaming.
lain [Mon, 6 Apr 2020 11:46:34 +0000 (13:46 +0200)]
Transmogrifier: Refactoring / Renaming.

4 years agousing another fn for file deletion
Alexander Strizhakov [Mon, 6 Apr 2020 11:27:20 +0000 (14:27 +0300)]
using another fn for file deletion

4 years agotests for emoji mix task
Alexander Strizhakov [Mon, 6 Apr 2020 07:45:25 +0000 (10:45 +0300)]
tests for emoji mix task

4 years agoMerge branch 'fix/docs-markdown' into 'develop'
feld [Thu, 2 Apr 2020 19:36:55 +0000 (19:36 +0000)]
Merge branch 'fix/docs-markdown' into 'develop'

Fix formatting in documentation

See merge request pleroma/pleroma!2348

4 years agoFix formatting in documentation
Egor Kislitsyn [Thu, 2 Apr 2020 19:01:29 +0000 (23:01 +0400)]
Fix formatting in documentation

4 years agoMerge branch '2323-accounts-relationships-hotfix' into 'develop'
feld [Thu, 2 Apr 2020 16:48:47 +0000 (16:48 +0000)]
Merge branch '2323-accounts-relationships-hotfix' into 'develop'

[#2323] Fixed /accounts/relationships

Closes pleroma-fe#820

See merge request pleroma/pleroma!2347

4 years agoMerge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix'...
Ivan Tashkinov [Thu, 2 Apr 2020 16:38:39 +0000 (19:38 +0300)]
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses

# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex

4 years ago[#2323] Fixed a typo causing /accounts/relationships to render default relationships...
Ivan Tashkinov [Thu, 2 Apr 2020 16:23:30 +0000 (19:23 +0300)]
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.

4 years agoAdd oAuth
Egor Kislitsyn [Thu, 2 Apr 2020 13:33:23 +0000 (17:33 +0400)]
Add oAuth

4 years agoMerge branch 'develop' into issue/1276
Maksim Pechnikov [Thu, 2 Apr 2020 11:47:17 +0000 (14:47 +0300)]
Merge branch 'develop' into issue/1276

4 years agoupdate Oban package
Maksim Pechnikov [Thu, 2 Apr 2020 06:34:11 +0000 (09:34 +0300)]
update Oban package

4 years agoAdd OpenAPI
Egor Kislitsyn [Wed, 1 Apr 2020 19:00:59 +0000 (23:00 +0400)]
Add OpenAPI

4 years agoerror improvement for email_invite endpoint
Alexander Strizhakov [Wed, 1 Apr 2020 17:26:33 +0000 (20:26 +0300)]
error improvement for email_invite endpoint

4 years agoMerge branch 'update/adminfe-20200331' into 'develop'
feld [Wed, 1 Apr 2020 17:12:59 +0000 (17:12 +0000)]
Merge branch 'update/adminfe-20200331' into 'develop'

Update AdminFE build in preparation for Pleroma 2.0.2

See merge request pleroma/pleroma!2343

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...
Ivan Tashkinov [Wed, 1 Apr 2020 17:08:14 +0000 (20:08 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses

# Conflicts:
# CHANGELOG.md

4 years agoMerge branch 'gun' into 'develop'
feld [Wed, 1 Apr 2020 17:05:09 +0000 (17:05 +0000)]
Merge branch 'gun' into 'develop'

Gun adapter

Closes #945

See merge request pleroma/pleroma!1861

4 years agoAbility to control the output of account/pleroma/relationship in statuses in order...
Ivan Tashkinov [Wed, 1 Apr 2020 16:49:09 +0000 (19:49 +0300)]
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.

4 years agoValidators: Correct ObjectID filename
lain [Wed, 1 Apr 2020 14:10:17 +0000 (16:10 +0200)]
Validators: Correct ObjectID filename

4 years agoMerge branch 'fix/1601-add-new-meta-tag' into 'develop'
rinpatch [Wed, 1 Apr 2020 12:55:52 +0000 (12:55 +0000)]
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'

Restrict remote users from indexing

Closes #1601

See merge request pleroma/pleroma!2341

4 years agorestrict remote users from indexing
Alexander Strizhakov [Wed, 1 Apr 2020 06:55:05 +0000 (09:55 +0300)]
restrict remote users from indexing

4 years agoMerge branch 'ops/fix-ci' into 'develop'
Haelwenn [Wed, 1 Apr 2020 03:44:47 +0000 (03:44 +0000)]
Merge branch 'ops/fix-ci' into 'develop'

Ops/fix ci

See merge request pleroma/pleroma!2340

4 years agoremove testing `only:` in docker build
jp [Wed, 1 Apr 2020 02:16:36 +0000 (22:16 -0400)]
remove testing `only:` in docker build

4 years agoadd imagemagick and update inherited container to alpine:3.11
jp [Wed, 1 Apr 2020 01:31:23 +0000 (21:31 -0400)]
add imagemagick and update inherited container to alpine:3.11