b085cd2660
Add a test for safe_jsonb_set
2019-10-18 15:22:16 +03:00
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
724f611b0e
Merge branch 'cleanup/deprecated_config_upload' into 'develop'
...
upload.ex: Remove deprecated configuration
See merge request pleroma/pleroma!1855
2019-10-18 11:34:48 +00:00
3c6fd0bb99
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
2019-10-18 04:42:02 +00:00
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
2019-10-18 04:36:37 +00:00
6c82b6e3bf
Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
...
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message
See merge request pleroma/pleroma!1853
2019-10-17 20:05:01 +00:00
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
2019-10-16 12:29:08 +00:00
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
b8be6a4dc9
Remove a failing search test due to it being unrealistic
...
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
2019-10-16 15:09:39 +03:00
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
0a5175ecbb
Order fts results by trigram
2019-10-16 13:49:33 +03:00
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
2019-10-16 12:52:47 +03:00
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
8c0cfed825
some fixes
2019-10-15 16:26:04 +03:00
e7bb762ec2
don't stream in benchmark env
2019-10-15 15:16:17 +03:00
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
2019-10-15 21:09:44 +09:00
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
2019-10-14 19:40:40 +00:00
e0da0d4f9e
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
...
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
2019-10-14 19:17:06 +00:00
2f0ed5f6c4
Fix hiding branch name logic
2019-10-14 22:15:16 +03:00
8b39d6f93c
Merge branch 'master-to-stable' into 'develop'
...
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
2019-10-14 16:08:53 +00:00
17b8896c40
Correct version parser branch name detection
2019-10-14 18:45:16 +03:00
d1e969842d
Add a changelog entry for branch-moving
2019-10-14 18:42:30 +03:00
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 18:39:56 +03:00
0e9243e8a2
Preparations for renaming `master` to `stable`
2019-10-14 18:38:51 +03:00
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
2019-10-13 15:37:49 +00:00
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
2019-10-12 14:42:55 +00:00
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
2019-10-11 22:52:38 +03:00
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
44afe4c887
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
2019-10-11 10:56:45 +00:00
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
b750135acd
pleroma_ctl: Make it possible to specify branches/flavours when updating
2019-10-11 13:22:21 +03:00
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
2019-10-10 15:42:54 +02:00
b9b00e6e96
Gitlab CI: Run correct benchmark task.
2019-10-10 15:31:32 +02:00
2629493804
Benchmark config: Database adjustments.
2019-10-10 15:01:06 +02:00
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
02f8e2a8ab
Gitlab: Run benchmark in CI.
2019-10-10 14:24:54 +02:00
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
2019-10-09 16:33:05 +00:00
c9b3f0151b
Merge branch 'webfinger-mocks' into 'develop'
...
provide mocks for webfinger endpoints
See merge request pleroma/pleroma!1821
2019-10-09 16:32:28 +00:00
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
2019-10-09 15:10:08 +00:00
f64dfd317f
Merge branch 'feature/count-statuses-task' into 'develop'
...
Add a task to re-count statuses for all users
Closes #1305
See merge request pleroma/pleroma!1823
2019-10-09 14:11:23 +00:00
rinpatch