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
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
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.
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
Alexander Strizhakov [Wed, 1 Apr 2020 06:55:05 +0000 (09:55 +0300)]
restrict remote users from indexing
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
jp [Wed, 1 Apr 2020 02:16:36 +0000 (22:16 -0400)]
remove testing `only:` in docker build
jp [Wed, 1 Apr 2020 01:31:23 +0000 (21:31 -0400)]
add imagemagick and update inherited container to alpine:3.11
feld [Tue, 31 Mar 2020 22:32:48 +0000 (22:32 +0000)]
Merge branch 'fix/docker-mogrify' into 'develop'
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
Mark Felder [Tue, 31 Mar 2020 22:28:41 +0000 (17:28 -0500)]
Remove problematic --cache-from argument
Haelwenn [Tue, 31 Mar 2020 22:04:02 +0000 (22:04 +0000)]
Merge branch 'bugfix/funkwhale-channel' into 'develop'
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
Haelwenn (lanodan) Monnier [Mon, 30 Mar 2020 00:01:09 +0000 (02:01 +0200)]
Provide known-good user.uri, remove User.profile_url/1
Haelwenn (lanodan) Monnier [Sun, 29 Mar 2020 20:30:50 +0000 (22:30 +0200)]
User: Fix use of source_data in profile_url/1
Haelwenn (lanodan) Monnier [Sun, 29 Mar 2020 20:01:49 +0000 (22:01 +0200)]
Initial failing test statement against funkwhale channels
feld [Tue, 31 Mar 2020 19:36:04 +0000 (19:36 +0000)]
Merge branch 'fix/docker-mogrify' into 'develop'
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
Mark Felder [Tue, 31 Mar 2020 19:29:43 +0000 (14:29 -0500)]
Add imagemagick to Docker image to fix broken mogrify plugin
lain [Mon, 30 Mar 2020 14:48:00 +0000 (14:48 +0000)]
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements
See merge request pleroma/pleroma!2308
rinpatch [Mon, 30 Mar 2020 12:38:21 +0000 (12:38 +0000)]
Merge branch 'removing-grouped-reports' into 'develop'
Removing grouped reports endpoint
See merge request pleroma/pleroma!2335
Alexander Strizhakov [Mon, 30 Mar 2020 10:50:00 +0000 (13:50 +0300)]
removing grouped reports admin api endpoint
Alexander Strizhakov [Mon, 30 Mar 2020 09:47:12 +0000 (12:47 +0300)]
updating gun with bug fix
https://github.com/ninenines/gun/issues/222
Alexander Strizhakov [Mon, 30 Mar 2020 09:16:45 +0000 (12:16 +0300)]
changelog fix
Alexander Strizhakov [Mon, 30 Mar 2020 09:15:23 +0000 (12:15 +0300)]
Merge branch 'develop' into gun
Alexander Strizhakov [Mon, 30 Mar 2020 08:59:14 +0000 (11:59 +0300)]
use in timelines benchmark new user generator
Alexander Strizhakov [Tue, 17 Mar 2020 10:47:13 +0000 (13:47 +0300)]
fix
Alexander Strizhakov [Tue, 18 Feb 2020 09:19:10 +0000 (12:19 +0300)]
sync with develop
Alexander Strizhakov [Tue, 14 Jan 2020 11:42:30 +0000 (14:42 +0300)]
activities generation tasks
Haelwenn [Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)]
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
lain [Fri, 27 Mar 2020 19:14:46 +0000 (19:14 +0000)]
Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'
Performance improvements (timeline / statuses / notifications / accounts rendering)
See merge request pleroma/pleroma!2323
Ivan Tashkinov [Fri, 27 Mar 2020 05:01:03 +0000 (08:01 +0300)]
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
Ivan Tashkinov [Thu, 26 Mar 2020 18:54:01 +0000 (21:54 +0300)]
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
Ivan Tashkinov [Thu, 26 Mar 2020 06:43:58 +0000 (09:43 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
# Conflicts:
# lib/pleroma/thread_mute.ex
rinpatch [Wed, 25 Mar 2020 18:06:00 +0000 (18:06 +0000)]
Merge branch 'benchmark_timeline' into 'develop'
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
rinpatch [Wed, 25 Mar 2020 18:00:24 +0000 (18:00 +0000)]
Merge branch '1364-notifications-sending-control' into 'develop'
[#1364] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
Ivan Tashkinov [Wed, 25 Mar 2020 17:41:17 +0000 (20:41 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
Ivan Tashkinov [Wed, 25 Mar 2020 17:33:34 +0000 (20:33 +0300)]
Further preloading (more endpoints), refactoring, tests.
lain [Wed, 25 Mar 2020 15:48:15 +0000 (15:48 +0000)]
Apply suggestion to benchmarks/load_testing/generator.ex
Haelwenn [Wed, 25 Mar 2020 14:57:19 +0000 (14:57 +0000)]
Merge branch 'add-test-update_credentials' into 'develop'
Add a test for accounts/update_credentials
See merge request pleroma/pleroma!2330
Egor Kislitsyn [Wed, 25 Mar 2020 14:46:17 +0000 (18:46 +0400)]
Add a test for accounts/update_credentials
Ivan Tashkinov [Wed, 25 Mar 2020 14:01:45 +0000 (17:01 +0300)]
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
Ivan Tashkinov [Wed, 25 Mar 2020 10:05:00 +0000 (13:05 +0300)]
[#1364] Minor improvements / comments.
Further fixes of incorrect usage of "relations" as a short form of "relationships".
Ivan Tashkinov [Wed, 25 Mar 2020 06:05:17 +0000 (09:05 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Ivan Tashkinov [Wed, 25 Mar 2020 06:04:00 +0000 (09:04 +0300)]
Fixed incorrect usage of "relations" as a short form of "relationships".
Ivan Tashkinov [Tue, 24 Mar 2020 19:15:37 +0000 (22:15 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
Ivan Tashkinov [Tue, 24 Mar 2020 19:14:26 +0000 (22:14 +0300)]
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
feld [Tue, 24 Mar 2020 19:10:32 +0000 (19:10 +0000)]
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
lain [Tue, 24 Mar 2020 17:34:13 +0000 (17:34 +0000)]
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
Egor Kislitsyn [Tue, 24 Mar 2020 13:38:18 +0000 (17:38 +0400)]
Fix activity deletion
rinpatch [Mon, 23 Mar 2020 19:32:01 +0000 (19:32 +0000)]
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
lain [Mon, 23 Mar 2020 17:56:01 +0000 (18:56 +0100)]
Benchmarks: Add timeline benchmark
lain [Mon, 23 Mar 2020 14:58:55 +0000 (15:58 +0100)]
Home timeline tests: Add failing test for relationships
Ivan Tashkinov [Mon, 23 Mar 2020 11:34:58 +0000 (14:34 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
rinpatch [Mon, 23 Mar 2020 10:43:20 +0000 (10:43 +0000)]
Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe
Closes #1453
See merge request pleroma/pleroma!2324
Egor Kislitsyn [Mon, 23 Mar 2020 10:03:31 +0000 (14:03 +0400)]
Add emoji support in statuses in staticfe
Ivan Tashkinov [Mon, 23 Mar 2020 09:01:11 +0000 (12:01 +0300)]
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
Ivan Tashkinov [Sun, 22 Mar 2020 18:51:44 +0000 (21:51 +0300)]
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
Haelwenn (lanodan) Monnier [Sun, 22 Mar 2020 15:38:12 +0000 (16:38 +0100)]
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
rinpatch [Sun, 22 Mar 2020 14:32:40 +0000 (14:32 +0000)]
Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
Haelwenn [Sun, 22 Mar 2020 14:25:11 +0000 (14:25 +0000)]
Merge branch 'relationship-remove-outdated-hack' into 'develop'
Mastodon API Account view: Remove an outdated hack
See merge request pleroma/pleroma!2321
rinpatch [Sun, 22 Mar 2020 14:10:37 +0000 (17:10 +0300)]
Mastodon API Account view: Remove an outdated hack
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
Alexander Strizhakov [Fri, 20 Mar 2020 17:58:47 +0000 (20:58 +0300)]
updating clear_config
Alexander Strizhakov [Fri, 20 Mar 2020 17:47:54 +0000 (20:47 +0300)]
Merge branch 'develop' into gun
lain [Fri, 20 Mar 2020 16:57:51 +0000 (16:57 +0000)]
Merge branch 'fix-feed-pagination' into 'develop'
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
lain [Fri, 20 Mar 2020 16:54:55 +0000 (16:54 +0000)]
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
Ivan Tashkinov [Fri, 20 Mar 2020 15:33:00 +0000 (18:33 +0300)]
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
Ivan Tashkinov [Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
lain [Fri, 20 Mar 2020 14:40:08 +0000 (14:40 +0000)]
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'
restrict_unauthenticated setting
Closes #1206
See merge request pleroma/pleroma!2318
Alexander Strizhakov [Fri, 20 Mar 2020 10:04:37 +0000 (13:04 +0300)]
restrict_unauthenticated setting
lain [Fri, 20 Mar 2020 13:27:29 +0000 (13:27 +0000)]
Merge branch 'feature/1635-notifications-include-types' into 'develop'
include_types parameter in /api/v1/notifications
Closes #1635
See merge request pleroma/pleroma!2311
Alexander Strizhakov [Wed, 18 Mar 2020 14:37:54 +0000 (17:37 +0300)]
include_types parameter in /api/v1/notifications
lain [Thu, 19 Mar 2020 18:10:39 +0000 (18:10 +0000)]
Merge branch 'fix-testing' into 'develop'
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
stwf [Thu, 19 Mar 2020 16:25:36 +0000 (12:25 -0400)]
remove federated testing
Ivan Tashkinov [Wed, 18 Mar 2020 17:30:31 +0000 (20:30 +0300)]
Improved in-test config management functions.
Alexander Strizhakov [Wed, 18 Mar 2020 11:08:40 +0000 (14:08 +0300)]
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
Alexander Strizhakov [Wed, 18 Mar 2020 11:08:21 +0000 (14:08 +0300)]
Merge branch 'develop' into gun
rinpatch [Wed, 18 Mar 2020 10:12:50 +0000 (10:12 +0000)]
Merge branch 'feature/1530-removing-with_move' into 'develop'
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
Cevado [Tue, 17 Mar 2020 01:02:01 +0000 (22:02 -0300)]
Fix ssl option on Ecto config breaking release
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
Mark Felder [Mon, 16 Mar 2020 20:39:34 +0000 (15:39 -0500)]
Enable Gun adapter by default
We need devs to dogfood this before we merge it into the 2.1 release
Ivan Tashkinov [Mon, 16 Mar 2020 18:58:10 +0000 (21:58 +0300)]
[#1364] Improved notification-related tests.
eugenijm [Fri, 31 Jan 2020 18:07:46 +0000 (21:07 +0300)]
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
Haelwenn [Mon, 16 Mar 2020 17:42:10 +0000 (17:42 +0000)]
Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
eugenijm [Tue, 28 Jan 2020 06:47:59 +0000 (09:47 +0300)]
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
Alexander Strizhakov [Mon, 16 Mar 2020 17:05:21 +0000 (20:05 +0300)]
removing with_move parameter
Mark Felder [Mon, 16 Mar 2020 16:44:53 +0000 (11:44 -0500)]
Improve documentation of mrf_object_age
Ivan Tashkinov [Mon, 16 Mar 2020 14:58:42 +0000 (17:58 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
rinpatch [Mon, 16 Mar 2020 14:32:23 +0000 (14:32 +0000)]
Merge branch 'feat/templates' into 'develop'
gitlab: create templates for bug reports and release MRs
See merge request pleroma/pleroma!2304
rinpatch [Mon, 16 Mar 2020 14:26:28 +0000 (17:26 +0300)]
gitlab: create templates for bug reports and release MRs
Alexander Strizhakov [Mon, 16 Mar 2020 13:23:49 +0000 (16:23 +0300)]
fix
Alexander Strizhakov [Mon, 16 Mar 2020 12:47:25 +0000 (15:47 +0300)]
temp fix for `:gun.info` MatchError
Alexander Strizhakov [Mon, 16 Mar 2020 11:35:27 +0000 (14:35 +0300)]
Merge branch 'develop' into gun
rinpatch [Mon, 16 Mar 2020 11:27:10 +0000 (11:27 +0000)]
Merge branch 'fix-warnings-in-tests' into 'develop'
Warnings fix
See merge request pleroma/pleroma!2303
Alexander Strizhakov [Mon, 16 Mar 2020 11:25:55 +0000 (14:25 +0300)]
Merge branch 'develop' into gun
Alexander Strizhakov [Mon, 16 Mar 2020 11:19:36 +0000 (14:19 +0300)]
warnings fix
rinpatch [Mon, 16 Mar 2020 11:08:06 +0000 (11:08 +0000)]
Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
Alexander Strizhakov [Mon, 16 Mar 2020 11:01:35 +0000 (14:01 +0300)]
removing from descriptions.exs deprecated settings
Alexander Strizhakov [Fri, 13 Mar 2020 14:58:14 +0000 (17:58 +0300)]
fix for content-type header for tag feed
Alexander Strizhakov [Fri, 13 Mar 2020 14:41:26 +0000 (17:41 +0300)]
adding rss for user feed
Alexander Strizhakov [Tue, 10 Mar 2020 15:11:48 +0000 (18:11 +0300)]
fix for feed page pagination
rinpatch [Sun, 15 Mar 2020 20:04:31 +0000 (20:04 +0000)]
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
rinpatch [Sun, 15 Mar 2020 19:53:52 +0000 (19:53 +0000)]
Merge branch 'features/staticfe-sanitization' into 'develop'
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 16:00:54 +0000 (17:00 +0100)]
static_fe: Sanitize HTML in users
projects / akkoma / log