Alex Gleason
de7f84deb3
Merge branch 'apps-api-endpoint' into 'develop'
...
Apps API endpoint
See merge request pleroma/pleroma!3583
2021-12-28 14:38:02 +00:00
Alex Gleason
52a3f0f08b
Merge branch 'ensure-staff-privileged-strict' into 'develop'
...
EnsureStaffPrivilegedPlug: don't let non-moderators through
See merge request pleroma/pleroma!3582
2021-12-28 00:53:11 +00:00
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test
2021-12-27 18:52:34 -06:00
Alex Gleason
7704a722c0
AppController: remove unnecessary require Logger
2021-12-27 18:30:16 -06:00
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1
2021-12-27 18:29:03 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
Alex Gleason
fa35e24a5e
Apps: add user_id index
2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
Alex Gleason
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
2021-12-27 17:18:26 -06:00
Alex Gleason
264f0fde1b
Merge branch 'admin-fix-duplicated-endpoints' into 'develop'
...
AdminAPI: fix duplicated routes
See merge request pleroma/pleroma!3581
2021-12-27 23:12:14 +00:00
Alex Gleason
a3fa987611
AdminAPI: fix duplicated routes
2021-12-27 16:58:10 -06:00
Alex Gleason
fd9260d1b5
Merge branch 'finch' into 'develop'
...
Finch support
See merge request pleroma/pleroma!3565
2021-12-27 18:27:13 +00:00
Alex Gleason
9b5dbd20b0
Merge branch 'tag-gun-erratic' into 'develop'
...
ConnectionPoolTest: tag erratic test
See merge request pleroma/pleroma!3580
2021-12-27 17:41:28 +00:00
Alex Gleason
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch
2021-12-27 11:31:15 -06:00
Alex Gleason
d61a5515e6
ConnectionPoolTest: tag erratic test
2021-12-27 11:27:25 -06:00
Alex Gleason
a659428024
Merge branch 'restricted-moderators' into 'develop'
...
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
2021-12-27 17:06:22 +00:00
Alex Gleason
479fc5fff8
EnsureStaffPrivilegedPlug: add tests
2021-12-27 10:39:59 -06:00
Alex Gleason
6e27fc9c12
Merge branch 'log-slow-queries' into 'develop'
...
Log slow Ecto queries
See merge request pleroma/pleroma!3553
2021-12-27 15:41:06 +00:00
Ivan Tashkinov
08c0f09bad
Made slow queries logging disabled by default.
2021-12-27 09:13:31 +03:00
Alibek Omarov
f02715c4b2
Fix lint errors
2021-12-27 03:42:03 +03:00
Alibek Omarov
f66675f349
API: fix duplicate :get_password_token route
2021-12-27 02:57:54 +03:00
Alibek Omarov
1c223331fc
API: show info about privileged staff in instance metadata
2021-12-27 02:28:09 +03:00
Alibek Omarov
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03:00
Ivan Tashkinov
3e9e7178bc
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
2021-12-26 22:49:00 +03:00
Lain Soykaf
ac3b503721
CI: Fix the broken tasks.
2021-12-26 18:54:54 +01:00
Lain Soykaf
c52390a7d9
CI: Use own package as base
...
So we can skip updating and installing the same packages a million
times. It will still grab the hex.pm stuff -- maybe we can find a way to
avoid this, too.
2021-12-26 18:05:42 +01:00
lain
3b8eaadb0d
Merge branch 'erratic' into 'develop'
...
CI: Start testing erratic test again
See merge request pleroma/pleroma!3575
2021-12-26 16:35:09 +00:00
Lain Soykaf
7ed2258979
Update changelog
2021-12-26 17:00:09 +01:00
Lain Soykaf
4cf03046f5
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:57:17 +01:00
Lain Soykaf
6efbd08854
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:41:17 +01:00
Lain Soykaf
e8e8d2262e
CI: Start testing erratic test again
...
Erratic tests are now ran in their own task, so we don't block
normal testing. The runtime is under a minute, so even if this one
has to be retried, it shouldn't take forever.
2021-12-26 16:17:48 +01:00
Alex Gleason
2e2fb5f802
Merge branch 'ci-dont-retry' into 'develop'
...
GitLab CI: don't retry failed jobs
See merge request pleroma/pleroma!3574
2021-12-26 02:40:26 +00:00
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
2021-12-26 02:35:17 +00:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
0eb6e858f7
Merge branch 'notice-routes' into 'develop'
...
Add notice compatibility routes for other frontends
Closes #1785
See merge request pleroma/pleroma!3402
2021-12-26 02:33:28 +00:00
Alex Gleason
cac4ed5eb0
GitLab CI: don't retry failed jobs
2021-12-25 20:15:21 -06:00
Alex Gleason
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
2021-12-25 20:11:14 -06:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
Alex Gleason
b4291bce8a
Merge branch 'remote-follow-api' into 'develop'
...
remote_interaction API endpoint
See merge request pleroma/pleroma!3545
2021-12-25 01:32:47 +00:00
marcin mikołajczak
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-25 00:52:02 +01:00
Alex Gleason
1fa616638b
Merge branch 'warnings-as-errors' into 'develop'
...
Enable :warnings_as_errors for CI only
See merge request pleroma/pleroma!3474
2021-12-23 16:19:57 +00:00
Alex Gleason
2caade10df
Merge branch 'add-nodeinfo-doc' into 'develop'
...
Add initial Nodeinfo document
See merge request pleroma/pleroma!3546
2021-12-23 16:01:03 +00:00
Hakaba Hitoyo
87871ac857
Add initial Nodeinfo document
2021-12-23 16:01:02 +00:00
Alex Gleason
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-23 16:00:16 +00:00
Alex Gleason
05c7a14101
Merge branch 'moderators' into 'develop'
...
AdminAPI: let moderators actually do things
Closes #2490
See merge request pleroma/pleroma!3480
2021-12-22 16:37:35 +00:00
Alex Gleason
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
2021-12-22 04:14:31 +00:00
Alex Gleason
2ce7dae6de
Skip erratic tests
2021-12-21 22:04:15 -06:00
Alex Gleason
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
2021-12-19 12:55:36 -06:00
