Alexander Strizhakov [Mon, 24 Feb 2020 16:56:27 +0000 (19:56 +0300)]
open conn in separate task
Alexander Strizhakov [Fri, 21 Feb 2020 13:56:55 +0000 (16:56 +0300)]
fix for timeout clause
Alexander Strizhakov [Fri, 21 Feb 2020 11:33:55 +0000 (14:33 +0300)]
hackney pool timeout
Alexander Strizhakov [Fri, 21 Feb 2020 11:28:16 +0000 (14:28 +0300)]
don't log info ssl messages
Alexander Strizhakov [Fri, 21 Feb 2020 09:53:40 +0000 (12:53 +0300)]
more info in Connections.checkin timout errors
Alexander Strizhakov [Fri, 21 Feb 2020 09:32:42 +0000 (12:32 +0300)]
by default don't use gun retries
remove conn depends on retry setting from config
Alexander Strizhakov [Fri, 21 Feb 2020 07:15:56 +0000 (10:15 +0300)]
temp using tesla from fork
Alexander Strizhakov [Fri, 21 Feb 2020 07:02:37 +0000 (10:02 +0300)]
Merge branch 'develop' into gun
Haelwenn [Thu, 20 Feb 2020 23:53:52 +0000 (23:53 +0000)]
Merge branch 'migration-fixes-20' into 'develop'
Migrations: Make them not fail for old databases
See merge request pleroma/pleroma!2227
Haelwenn [Thu, 20 Feb 2020 23:52:45 +0000 (23:52 +0000)]
Merge branch 'fix/gin-fuzzy' into 'develop'
Improve GIN full text search performance
See merge request pleroma/pleroma!2228
Haelwenn [Thu, 20 Feb 2020 23:50:40 +0000 (23:50 +0000)]
Merge branch 'single_emoji_reaction' into 'develop'
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
Mark Felder [Thu, 20 Feb 2020 21:34:10 +0000 (15:34 -0600)]
Apply database session parameter to improve GIN full text search
lain [Thu, 20 Feb 2020 15:44:31 +0000 (16:44 +0100)]
Migrations: Make them not fail for old databases
lain [Thu, 20 Feb 2020 12:13:21 +0000 (12:13 +0000)]
Merge branch 'require-signature' into 'develop'
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
lain [Thu, 20 Feb 2020 12:04:29 +0000 (12:04 +0000)]
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
lain [Thu, 20 Feb 2020 12:03:21 +0000 (12:03 +0000)]
Merge branch 'docs_updating' into 'develop'
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
lain [Thu, 20 Feb 2020 11:58:37 +0000 (11:58 +0000)]
Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
lain [Thu, 20 Feb 2020 11:36:48 +0000 (11:36 +0000)]
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
lain [Wed, 19 Feb 2020 16:17:05 +0000 (17:17 +0100)]
Emoji Reactions: Add documentation
lain [Wed, 19 Feb 2020 16:16:45 +0000 (17:16 +0100)]
Pleroma API: Add endpoint to get reaction information on a single emoji
Alexander Strizhakov [Wed, 19 Feb 2020 09:19:03 +0000 (12:19 +0300)]
removing retry option and changing some logger messages levels
feld [Tue, 18 Feb 2020 21:03:01 +0000 (21:03 +0000)]
Merge branch 'fix/mrf-sample-doc' into 'develop'
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
feld [Tue, 18 Feb 2020 20:58:15 +0000 (20:58 +0000)]
Merge branch 'develop' into 'fix/mrf-sample-doc'
# Conflicts:
# docs/configuration/mrf.md
feld [Tue, 18 Feb 2020 20:57:23 +0000 (20:57 +0000)]
Merge branch 'fix/mrf-docs' into 'develop'
Fix MRF documentation
See merge request pleroma/pleroma!2187
feld [Tue, 18 Feb 2020 20:45:31 +0000 (20:45 +0000)]
Merge branch 'chore/config-descriptions' into 'develop'
Additional config description improvements
See merge request pleroma/pleroma!2207
Mark Felder [Tue, 18 Feb 2020 15:30:18 +0000 (09:30 -0600)]
Spelling was wrong in test as well
Mark Felder [Tue, 18 Feb 2020 15:18:09 +0000 (09:18 -0600)]
Spelling
Mark Felder [Tue, 18 Feb 2020 15:12:46 +0000 (09:12 -0600)]
Improve changelog message
Mark Felder [Tue, 18 Feb 2020 15:06:27 +0000 (09:06 -0600)]
Merge branch 'develop' into gun
lain [Tue, 18 Feb 2020 14:56:59 +0000 (14:56 +0000)]
Merge branch 'fix/status-view/expires_at' into 'develop'
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
Ivan Tashkinov [Tue, 18 Feb 2020 14:52:31 +0000 (17:52 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
lain [Tue, 18 Feb 2020 14:36:10 +0000 (14:36 +0000)]
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
lain [Tue, 18 Feb 2020 14:32:03 +0000 (14:32 +0000)]
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
Egor Kislitsyn [Tue, 18 Feb 2020 13:09:50 +0000 (17:09 +0400)]
Add a test
lain [Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)]
Merge branch 'chore/floki-update' into 'develop'
Update floki to 0.25
See merge request pleroma/pleroma!2217
Egor Kislitsyn [Tue, 18 Feb 2020 10:52:11 +0000 (14:52 +0400)]
Fix `status.expires_at` type
Alexander Strizhakov [Tue, 11 Feb 2020 07:12:57 +0000 (10:12 +0300)]
adding gun adapter
feld [Mon, 17 Feb 2020 22:22:53 +0000 (22:22 +0000)]
Merge branch 'update/admin-fe-
20200217' into 'develop'
Update adminFE build
See merge request pleroma/pleroma!2221
Mark Felder [Mon, 17 Feb 2020 21:50:45 +0000 (15:50 -0600)]
Update adminFE build
Mark Felder [Mon, 17 Feb 2020 20:13:05 +0000 (14:13 -0600)]
Merge branch 'develop' into chore/floki-update
rinpatch [Mon, 17 Feb 2020 11:13:37 +0000 (11:13 +0000)]
Merge branch 'upgrade_crypto' into 'develop'
Update plug_crypto
See merge request pleroma/pleroma!2219
lain [Mon, 17 Feb 2020 10:41:14 +0000 (11:41 +0100)]
Update plug_crypto
rinpatch [Mon, 17 Feb 2020 10:34:32 +0000 (10:34 +0000)]
Merge branch 'feat/git-attributes-elixir' into 'develop'
.gitattributes: use native support for elixir definitions
See merge request pleroma/pleroma!2218
rinpatch [Mon, 17 Feb 2020 10:19:04 +0000 (13:19 +0300)]
.gitattributes: use native support for elixir definitions
see https://github.com/elixir-lang/elixir/pull/9823
rinpatch [Sat, 15 Feb 2020 22:55:26 +0000 (01:55 +0300)]
Use floki's new APIs for parsing fragments
lain [Sat, 15 Feb 2020 12:56:32 +0000 (12:56 +0000)]
Merge branch 'bugfix/link-preview-site_name' into 'develop'
MastodonAPI.StatusView: Do not use site_name
See merge request pleroma/pleroma!2216
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 23:35:46 +0000 (00:35 +0100)]
MastodonAPI.StatusView: Do not use site_name
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
rinpatch [Fri, 14 Feb 2020 18:25:54 +0000 (18:25 +0000)]
Merge branch 'chores/deps-to-hexpm' into 'develop'
Move ex_syslogger & recon to hexpm, update dependencies
See merge request pleroma/pleroma!2213
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:15:59 +0000 (19:15 +0100)]
Update all dependencies
Upgraded:
db_connection 2.2.0 => 2.2.1
earmark 1.4.2 => 1.4.3
ecto 3.3.1 => 3.3.3
ecto_sql 3.3.2 => 3.3.4
esshd 0.1.0 => 0.1.1
ex_doc 0.21.2 => 0.21.3
excoveralls 0.12.1 => 0.12.2
gettext 0.17.1 => 0.17.4
html_entities 0.5.0 => 0.5.1
httpoison 1.6.1 => 1.6.2
joken 2.1.0 => 2.2.0
jose 1.9.0 => 1.10.1
nimble_parsec 0.5.1 => 0.5.3
phoenix 1.4.10 => 1.4.13
phoenix_ecto 4.0.0 => 4.1.0
phoenix_html 2.13.3 => 2.14.0
plug_cowboy 2.1.0 => 2.1.2
plug_crypto 1.1.0 => 1.1.1
prometheus 4.4.1 => 4.5.0
tesla 1.3.0 => 1.3.2
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:08:37 +0000 (19:08 +0100)]
mix.exs: Move ex_syslogger and recon to hexpm
Haelwenn [Fri, 14 Feb 2020 17:58:26 +0000 (17:58 +0000)]
Merge branch 'update/ferd/recon' into 'develop'
Update ferd/recon
See merge request pleroma/pleroma!2211
Mark Felder [Fri, 14 Feb 2020 17:06:04 +0000 (11:06 -0600)]
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
Mark Felder [Fri, 14 Feb 2020 17:04:27 +0000 (11:04 -0600)]
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
Mark Felder [Fri, 14 Feb 2020 17:02:24 +0000 (11:02 -0600)]
Standardize @behaviour usage in MRFs
feld [Fri, 14 Feb 2020 16:55:52 +0000 (16:55 +0000)]
Apply suggestion to docs/configuration/mrf.md
Mark Felder [Fri, 14 Feb 2020 16:55:18 +0000 (10:55 -0600)]
Update suggested path for location of your custom MRF
Mark Felder [Fri, 14 Feb 2020 16:16:12 +0000 (10:16 -0600)]
Update ferd/recon, requested by @tk to support an AMPQ library he's
integrating with an MRF.
Upstream changelog:
2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)
Mark Felder [Thu, 13 Feb 2020 21:19:01 +0000 (15:19 -0600)]
Make the sample code actually compile
Ivan Tashkinov [Thu, 13 Feb 2020 18:55:47 +0000 (21:55 +0300)]
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
Mark Felder [Thu, 13 Feb 2020 18:09:11 +0000 (12:09 -0600)]
Formatting got me again
rinpatch [Thu, 13 Feb 2020 18:08:43 +0000 (18:08 +0000)]
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
Mark Felder [Thu, 13 Feb 2020 18:01:13 +0000 (12:01 -0600)]
Even more description improvements
Mark Felder [Thu, 13 Feb 2020 17:49:19 +0000 (11:49 -0600)]
Add missing Oban job for attachments_cleanup
Mark Felder [Thu, 13 Feb 2020 17:45:58 +0000 (11:45 -0600)]
More description cleanup work
Mark Felder [Thu, 13 Feb 2020 17:31:02 +0000 (11:31 -0600)]
More description cleanups
lain [Thu, 13 Feb 2020 17:17:43 +0000 (17:17 +0000)]
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'
Fix the confusingly named and inverted logic of "no_attachment_links"
See merge request pleroma/pleroma!2202
rinpatch [Thu, 13 Feb 2020 16:55:36 +0000 (16:55 +0000)]
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
deps: update back fast sanitize
See merge request pleroma/pleroma!2205
rinpatch [Thu, 13 Feb 2020 16:53:39 +0000 (19:53 +0300)]
NodeInfo: Fix federating status not being reported when MRF
transparency is disabled
Closes #1568
rinpatch [Thu, 13 Feb 2020 16:47:39 +0000 (19:47 +0300)]
deps: update back fast sanitize
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
feld [Thu, 13 Feb 2020 14:37:55 +0000 (14:37 +0000)]
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
# config/description.exs
feld [Thu, 13 Feb 2020 14:20:30 +0000 (14:20 +0000)]
Merge branch 'chore/config-descriptions' into 'develop'
Improve config descriptions
See merge request pleroma/pleroma!2201
feld [Thu, 13 Feb 2020 14:03:59 +0000 (14:03 +0000)]
Merge branch 'fix/status_expires_in_validation' into 'develop'
Fix `status.expires_in` validation
See merge request pleroma/pleroma!2203
Mark Felder [Thu, 13 Feb 2020 14:02:33 +0000 (08:02 -0600)]
Formatting
Mark Felder [Thu, 13 Feb 2020 14:01:39 +0000 (08:01 -0600)]
Formatting
feld [Thu, 13 Feb 2020 14:00:33 +0000 (14:00 +0000)]
Update description.exs
feld [Thu, 13 Feb 2020 13:59:47 +0000 (13:59 +0000)]
Apply suggestion to config/description.exs
Egor Kislitsyn [Wed, 12 Feb 2020 15:43:07 +0000 (19:43 +0400)]
Fix `status.expires_in` validation
Mark Felder [Tue, 11 Feb 2020 21:39:19 +0000 (15:39 -0600)]
Fix the confusingly named and inverted logic of "no_attachment_links"
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
Mark Felder [Tue, 11 Feb 2020 21:21:36 +0000 (15:21 -0600)]
First round at cleaning up descriptions
feld [Tue, 11 Feb 2020 21:08:37 +0000 (21:08 +0000)]
Merge branch 'restore-twitter-api-tests' into 'develop'
Restore TwitterAPI tests
Closes #1257
See merge request pleroma/pleroma!2200
Egor Kislitsyn [Tue, 11 Feb 2020 20:51:05 +0000 (00:51 +0400)]
Restore TwitterAPI tests
feld [Tue, 11 Feb 2020 20:08:28 +0000 (20:08 +0000)]
Merge branch 'update/admin-fe-
20200211' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2198
Egor Kislitsyn [Tue, 11 Feb 2020 19:33:05 +0000 (23:33 +0400)]
Hotlink logo instead of attachment
lain [Tue, 11 Feb 2020 17:09:48 +0000 (17:09 +0000)]
Merge branch 'revert-
3fee859b' into 'develop'
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
See merge request pleroma/pleroma!2199
feld [Tue, 11 Feb 2020 16:55:18 +0000 (16:55 +0000)]
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
Mark Felder [Tue, 11 Feb 2020 16:33:41 +0000 (10:33 -0600)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-
20200211
Mark Felder [Tue, 11 Feb 2020 16:24:38 +0000 (10:24 -0600)]
Update AdminFE build
lain [Tue, 11 Feb 2020 13:22:35 +0000 (13:22 +0000)]
Merge branch 'feat/floki-fasthtml' into 'develop'
Make Floki use fast_html
See merge request pleroma/pleroma!2194
rinpatch [Mon, 10 Feb 2020 21:29:25 +0000 (00:29 +0300)]
Make Floki use fast_html
rinpatch [Mon, 10 Feb 2020 21:16:13 +0000 (00:16 +0300)]
deps: update fast_sanitize to 0.1.7
needed to get new fast_html version since 1.0.1 had an attribute parsing
bug
rinpatch [Mon, 10 Feb 2020 18:52:01 +0000 (21:52 +0300)]
deps: update floki to 0.25.0
needed to make it use fast_html
lain [Tue, 11 Feb 2020 13:14:05 +0000 (13:14 +0000)]
Merge branch 'uguu-uwu-notices-bulge' into 'develop'
EmojiReactions: Align API endpoints
See merge request pleroma/pleroma!2183
lain [Tue, 11 Feb 2020 12:59:04 +0000 (13:59 +0100)]
Update frontend
lain [Tue, 11 Feb 2020 12:58:36 +0000 (13:58 +0100)]
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
lain [Tue, 11 Feb 2020 11:44:33 +0000 (11:44 +0000)]
Merge branch 'doc/unlisted-search' into 'develop'
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes #1164
See merge request pleroma/pleroma!2195
lain [Tue, 11 Feb 2020 09:55:16 +0000 (09:55 +0000)]
Merge branch 'oban-crontab-fix' into 'develop'
Set oban crontab to false in tests
See merge request pleroma/pleroma!2197
Egor Kislitsyn [Tue, 11 Feb 2020 09:54:55 +0000 (13:54 +0400)]
Merge branch 'develop' into feature/new-registrations-digest
Alexander Strizhakov [Tue, 11 Feb 2020 09:19:06 +0000 (12:19 +0300)]
set oban crontab to false in tests
lain [Tue, 11 Feb 2020 08:04:58 +0000 (08:04 +0000)]
Merge branch 'docs/kyclos' into 'develop'
clients.md: Add Kyclos
See merge request pleroma/pleroma!2196
Haelwenn (lanodan) Monnier [Tue, 11 Feb 2020 01:27:40 +0000 (02:27 +0100)]
clients.md: Add Kyclos
projects / akkoma / log