Commit Graph

  • ac3b503721 CI: Fix the broken tasks. Lain Soykaf 2021-12-26 18:54:54 +01:00
  • c52390a7d9 CI: Use own package as base Lain Soykaf 2021-12-26 18:05:42 +01:00
  • 3b8eaadb0d Merge branch 'erratic' into 'develop' lain 2021-12-26 16:35:09 +00:00
  • 7ed2258979 Update changelog Lain Soykaf 2021-12-26 17:00:09 +01:00
  • 4cf03046f5 Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch Lain Soykaf 2021-12-26 16:57:17 +01:00
  • 6efbd08854 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch Lain Soykaf 2021-12-26 16:41:17 +01:00
  • a1eeb811b6 Merge branch 'erratic' into 'develop' lain 2021-12-26 15:18:24 +00:00
  • e8e8d2262e CI: Start testing erratic test again Lain Soykaf 2021-12-26 16:14:56 +01:00
  • 2e2fb5f802 Merge branch 'ci-dont-retry' into 'develop' Alex Gleason 2021-12-26 02:40:26 +00:00
  • 68fed2a447 Merge branch 'ci-dont-retry' into 'develop' Alex Gleason 2021-12-26 02:40:25 +00:00
  • 913141379c Merge branch 'profile-directory' into 'develop' Alex Gleason 2021-12-26 02:35:17 +00:00
  • de006443f0 MastoAPI: Profile directory marcin mikołajczak 2021-12-26 02:35:17 +00:00
  • 26b3365c11 Merge branch 'profile-directory' into 'develop' marcin mikołajczak 2021-12-26 02:33:44 +00:00
  • 0eb6e858f7 Merge branch 'notice-routes' into 'develop' Alex Gleason 2021-12-26 02:33:28 +00:00
  • c2e8a9aec8 Merge branch 'notice-routes' into 'develop' Alex Gleason 2021-12-26 02:18:28 +00:00
  • cac4ed5eb0
    GitLab CI: don't retry failed jobs Alex Gleason 2021-12-25 20:15:21 -06:00
  • 2c06eff519
    Pleroma.Web.base_url() --> Endpoint.url() Alex Gleason 2021-12-25 20:11:14 -06:00
  • db2bf55e9b
    Merge remote-tracking branch 'origin/develop' into notice-routes Alex Gleason 2021-12-25 19:57:53 -06:00
  • efa06a3697 Add is_discoverable index to users marcin mikołajczak 2021-12-25 16:50:35 +01:00
  • de3a3488d4 fix tests marcin mikołajczak 2021-12-25 11:48:45 +01:00
  • 73609211a4 Merge branch 'account-notes' into 'develop' Alex Gleason 2021-12-25 01:41:12 +00:00
  • 2c07afe841 Merge branch 'account-notes' into 'develop' marcin mikołajczak 2021-12-25 01:35:03 +00:00
  • b96a58ff28 Merge branch 'account-subscriptions' into 'develop' Alex Gleason 2021-12-25 01:34:27 +00:00
  • fa55dd7906 Merge branch 'account-subscriptions' into 'develop' marcin mikołajczak 2021-12-25 01:33:49 +00:00
  • b4291bce8a Merge branch 'remote-follow-api' into 'develop' Alex Gleason 2021-12-25 01:32:47 +00:00
  • 12546eb9a9 Merge branch 'remote-follow-api' into 'develop' marcin mikołajczak 2021-12-25 01:32:28 +00:00
  • d3baef1e9e update tests? marcin mikołajczak 2021-12-25 01:16:36 +01:00
  • 9775955974 Merge remote-tracking branch 'origin/develop' into remote-follow-api marcin mikołajczak 2021-12-25 00:52:02 +01:00
  • 0ed44cdf15 it wasn't intended to be for local users only marcin mikołajczak 2021-12-25 00:35:22 +01:00
  • d538c36177 Profile directory: add tests marcin mikołajczak 2021-12-25 00:31:48 +01:00
  • 8eab47fd21 Profile directory: do not require authentication marcin mikołajczak 2021-12-25 00:13:42 +01:00
  • d92b491cb3 Include discoverable users only marcin mikołajczak 2021-12-25 00:10:14 +01:00
  • 26a08ef54d
    mix format object-flake Alex Gleason 2021-12-24 11:39:03 -06:00
  • 91902c87de
    Change HashtagsTableMigrator to use %DataMigrationFailedId{} structs with FlakeIds Alex Gleason 2021-12-24 11:28:46 -06:00
  • 1776ea1c86
    Object FlakeIds: also update data_migration_failed_ids table Alex Gleason 2021-12-24 10:13:24 -06:00
  • 73cde0aeeb
    Merge remote-tracking branch 'origin/develop' into object-flake Alex Gleason 2021-12-23 23:39:07 -06:00
  • 65eaada53d
    Chat deletion: fix missing ChatView alias 2061-chat-deletion Alex Gleason 2021-12-23 18:43:09 -06:00
  • 1fa616638b Merge branch 'warnings-as-errors' into 'develop' Alex Gleason 2021-12-23 16:19:57 +00:00
  • 545f471aa1 Merge branch 'warnings-as-errors' into 'develop' Alex Gleason 2021-12-23 16:16:26 +00:00
  • 2caade10df Merge branch 'add-nodeinfo-doc' into 'develop' Alex Gleason 2021-12-23 16:01:03 +00:00
  • 87871ac857 Add initial Nodeinfo document Hakaba Hitoyo 2021-12-23 16:01:02 +00:00
  • 24a806d4ba Merge branch 'add-nodeinfo-doc' into 'develop' Hakaba Hitoyo 2021-12-23 16:00:30 +00:00
  • d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' Alex Gleason 2021-12-23 16:00:16 +00:00
  • 3b8fdf01bc update docs marcin mikołajczak 2021-12-22 22:41:29 +01:00
  • dec4f8eb00 Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' Tusooa Zhu 2021-12-22 20:44:12 +00:00
  • cca9a54766 profile directory marcin mikołajczak 2021-12-22 21:23:44 +01:00
  • 0f646bb3b4 last_status_at marcin mikołajczak 2021-12-22 17:41:48 +01:00
  • 05c7a14101 Merge branch 'moderators' into 'develop' Alex Gleason 2021-12-22 16:37:35 +00:00
  • 663a3e4f9f Merge branch 'moderators' into 'develop' Alex Gleason 2021-12-22 16:32:45 +00:00
  • 07c30c9e6e
    Merge remote-tracking branch 'origin/develop' into 2061-chat-deletion Alex Gleason 2021-12-22 10:31:04 -06:00
  • aebd94e95d Merge remote-tracking branch 'origin/develop' into profile-directory marcin mikołajczak 2021-12-22 17:14:55 +01:00
  • 056a7c5a26 wip last_status_at marcin mikołajczak 2021-12-22 17:11:56 +01:00
  • 6124aef18d
    Merge remote-tracking branch 'origin/develop' into operation-warpsneed Alex Gleason 2021-12-21 22:15:27 -06:00
  • 9c1cb87eff Merge branch 'erratic-tests' into 'develop' Alex Gleason 2021-12-22 04:14:31 +00:00
  • cc0ee61ae7 Merge branch 'erratic-tests' into 'develop' Alex Gleason 2021-12-22 04:09:42 +00:00
  • 2ce7dae6de
    Skip erratic tests Alex Gleason 2021-12-21 22:04:15 -06:00
  • 416c3f1bda
    ActivityPub.Utils: fix infinite loop in build_flag_object/1 Alex Gleason 2021-12-21 21:20:27 -06:00
  • 304e6baf47
    mix format Alex Gleason 2021-12-21 12:02:57 -06:00
  • 5cd40ad9de
    ActivityPubControllerTest: count Objects, not Activities Alex Gleason 2021-12-21 11:39:18 -06:00
  • 820904d419
    Change timeline visibility test Alex Gleason 2021-12-21 11:35:04 -06:00
  • 40f14b9daa
    ActivityPub: fix ambiguous "actor" column reference Alex Gleason 2021-12-20 22:24:09 -06:00
  • 2e82321cef
    Fix lazy tests Alex Gleason 2021-12-20 21:12:31 -06:00
  • 79c7ba7f5d
    thread_visibility(): a JOIN on objects is no longer needed Alex Gleason 2021-12-20 20:39:02 -06:00
  • 3f8fc34593
    Merge remote-tracking branch 'origin/develop' into moderators Alex Gleason 2021-12-19 12:55:36 -06:00
  • 50892a198d Merge branch 'mkljczk-develop-patch-64464' into 'develop' Alex Gleason 2021-12-19 18:51:41 +00:00
  • 6b81dcc2ae Merge branch 'mkljczk-develop-patch-64464' into 'develop' marcin mikołajczak 2021-12-19 18:51:24 +00:00
  • b0d2b53934 Merge branch 'manifest' into 'develop' Alex Gleason 2021-12-19 18:18:59 +00:00
  • e009950845 Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace. Ivan Tashkinov 2021-12-19 20:35:00 +03:00
  • f3d2c77608 Merge branch 'manifest' into 'develop' Alex Gleason 2021-12-19 17:42:56 +00:00
  • df5359aa72 Merge branch 'replies-count' into 'develop' Alex Gleason 2021-12-19 17:36:25 +00:00
  • 4fda03468c Merge branch 'replies-count' into 'develop' marcin mikołajczak 2021-12-19 17:36:07 +00:00
  • d1510c98d7 Merge branch 'link-headers-chats' into 'develop' Alex Gleason 2021-12-19 17:35:50 +00:00
  • 8bed2b6113 Merge branch 'link-headers-chats' into 'develop' marcin mikołajczak 2021-12-19 17:35:42 +00:00
  • 1ff9ffed83 Merge branch 'live-dashboard' into 'develop' Alex Gleason 2021-12-19 17:35:14 +00:00
  • b8e08f3711 Merge branch 'live-dashboard' into 'develop' Alex Gleason 2021-12-19 17:34:55 +00:00
  • e4f9cb1c1b
    Merge remote-tracking branch 'origin/develop' into manifest Alex Gleason 2021-12-19 11:33:10 -06:00
  • bd853199d9 Merge branch 'v2-suggestions' into 'develop' Alex Gleason 2021-12-19 17:31:17 +00:00
  • 1fc43d4841 Merge branch 'v2-suggestions' into 'develop' Alex Gleason 2021-12-19 17:31:05 +00:00
  • 7c1d804554 Merge branch 'fix-search-dos' into 'develop' Alex Gleason 2021-12-19 17:30:52 +00:00
  • f5e5ea40ab Merge branch 'fix-search-dos' into 'develop' Alex Gleason 2021-12-19 14:43:53 +00:00
  • 0f81adf448
    Combine Activities and Objects into one table Alex Gleason 2021-12-18 18:26:40 -06:00
  • 0dc132a543
    Let "context_id" be a string Alex Gleason 2021-12-18 16:33:59 -05:00
  • 745e9814de
    Use string IDs in PaginationTest Alex Gleason 2021-12-18 15:28:23 -05:00
  • 2bc3505581
    Create HashtagObject schema Without it we can't specify that the object's ID is a FlakeId Alex Gleason 2021-12-18 15:27:05 -05:00
  • dbe0f05cec
    Change Object ID to FlakeId Alex Gleason 2021-12-18 13:49:04 -05:00
  • b686d68cdb Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop' lain 2021-12-18 15:04:55 +00:00
  • b15879cca2 Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop' Tusooa Zhu 2021-12-17 23:06:42 +00:00
  • ff17884c3b
    Bump alpine to 3.14 Tusooa Zhu 2021-12-17 18:00:29 -05:00
  • 8376e83f61
    Lint Tusooa Zhu 2021-12-17 16:52:50 -05:00
  • 538d5ac210
    Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568 Tusooa Zhu 2021-12-17 16:47:48 -05:00
  • 951d1592c7
    Add test to ensure removed follower cease to have relationship with ex-followee Tusooa Zhu 2021-12-17 16:44:22 -05:00
  • bfd870380c
    Add test to ensure the blocked cease to have follow relationship to the blocker Tusooa Zhu 2021-12-17 14:42:45 -05:00
  • 3d41ccc47b
    Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2 Tusooa Zhu 2021-12-17 14:17:51 -05:00
  • 8cfd527589 Merge branch 'verbose-emoji-loader' into 'develop' lain 2021-12-17 14:35:01 +00:00
  • dcdd75eaec Merge branch 'verbose-emoji-loader' into 'develop' a1batross 2021-12-17 14:16:49 +00:00
  • 31b9034a27 emoji/loader.ex: be more verbose about which emoji pack config is loading now a1batross 2021-12-17 14:15:44 +00:00
  • 5660bee2dc Dirty hack to make mediaproxy functional by relying on Hackney for that part Mark Felder 2021-12-16 11:36:58 -06:00
  • 827650a6ae
    LiveDashboard: enable request logger request-logger Alex Gleason 2021-12-15 20:09:35 -05:00
  • e1b89fe3aa
    Merge remote-tracking branch 'origin/develop' into live-dashboard Alex Gleason 2021-12-15 19:05:36 -05:00
  • 29d80b39f2
    Add Phoenix LiveDashboard Alex Gleason 2021-12-15 16:17:11 -05:00