Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Robert R George
20666482ef
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
Claire
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
Daniel M Brasil
f337008819
Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public ( #26239 )
2023-08-23 15:50:23 +02:00
Claire
191d302b7f
Refactor Api::V1::ProfilesController into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
Daniel M Brasil
d24a87ce4f
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-21 08:44:35 +02:00
Claire
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
Claire
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Daniel M Brasil
3a4d3e9d4b
Add GET /api/v1/instance/languages to REST API ( #24443 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-03 11:25:47 +02:00
Emelia Smith
e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )
2023-08-02 19:32:48 +02:00
Christian Schmidt
ca342d4838
Add List-Unsubscribe email header ( #26085 )
2023-08-01 19:34:40 +02:00
Claire
73a3228e0f
Fix CSP tests in glitch-soc
2023-07-30 17:30:13 +02:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire
42f36aa55a
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
2023-07-30 13:49:35 +02:00
Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
Daniel M Brasil
812a84ff5f
Migrate to request specs in /api/v2/filters ( #25721 )
2023-07-27 14:58:20 +02:00
Matt Jankowski
50ff3d3342
Coverage for Auth::OmniauthCallbacks controller ( #26147 )
2023-07-25 09:46:57 +02:00
Claire
e5f1000ad1
Fix CSP headers being unintendedly wide ( #26105 )
2023-07-21 13:34:15 +02:00
Christian Schmidt
4c18928a93
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
Claire
0092fe50ac
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
Daniel M Brasil
59b38f9ee4
Migrate to request specs in /api/v1/mutes ( #25622 )
2023-07-18 13:05:19 +02:00
Daniel M Brasil
58bfe8c43a
Migrate to request specs in /api/v1/bookmarks ( #25520 )
2023-07-18 09:15:50 +02:00
Daniel M Brasil
5a7c6c6597
Migrate to request specs in /api/v1/timelines/public ( #25746 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 09:15:18 +02:00
Daniel M Brasil
19208aa422
Migrate to request specs in /api/v1/statuses/:status_id/favourite ( #25626 )
2023-07-17 16:53:57 +02:00
Daniel M Brasil
6fb4a756ff
Migrate to request specs in /api/v1/statuses/:status_id/bookmark ( #25624 )
2023-07-17 16:51:49 +02:00
Daniel M Brasil
4859958a0c
Migrate to request specs in /api/v1/polls ( #25596 )
2023-07-17 16:50:00 +02:00
Daniel M Brasil
1aea938d3d
Migrate to request specs in /api/v1/statuses/:status_id/pin ( #25635 )
2023-07-17 16:24:05 +02:00
Daniel M Brasil
6cdc8408a9
Migrate to request specs in /api/v1/emails/confirmations ( #25686 )
2023-07-17 16:22:33 +02:00
Daniel M Brasil
8a1aabaac1
Migrate to request specs in /api/v1/timelines/home ( #25743 )
2023-07-17 16:20:11 +02:00
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Daniel M Brasil
6ac271c2a0
Migrate to request specs in /api/v1/suggestions ( #25540 )
2023-06-22 11:49:35 +02:00
Daniel M Brasil
e53eb38a8d
Migrate to request specs in /api/v1/admin/account_actions ( #25514 )
2023-06-20 18:16:48 +02:00
Daniel M Brasil
0a0a1f1495
Migrate to request specs in /api/v1/tags ( #25439 )
2023-06-19 08:51:40 +02:00
Daniel M Brasil
b10c05e702
Migrate to request specs in /api/v1/lists ( #25443 )
2023-06-15 10:19:51 +02:00
Daniel M Brasil
24015ef0cc
Migrate to request specs in /api/v1/domain_blocks ( #25414 )
2023-06-14 16:08:53 +02:00
Daniel M Brasil
87aff5aad8
Migrate to request specs in /api/v1/follow_requests ( #25411 )
2023-06-14 15:43:50 +02:00
Daniel M Brasil
a5b62e56d0
Migrate to request specs in /api/v1/apps/verify_credentials ( #25404 )
2023-06-14 09:48:57 +02:00
Daniel M Brasil
a6407aa662
Migrate to request specs in /api/v1/apps ( #25401 )
2023-06-14 09:48:48 +02:00
Matt Jankowski
4c5f62de99
Extract shared examples from api specs ( #25387 )
2023-06-14 09:34:01 +02:00
fusagiko / takayamaki
b19a695608
migrate test for GET /api/v1/accounts/{account_id} to request spec ( #25322 )
2023-06-10 18:33:24 +02:00
Daniel M Brasil
99216e34e5
Migrate to request specs in /api/v1/admin/canonical_email_blocks ( #25330 )
2023-06-10 18:33:02 +02:00
Daniel M Brasil
b4e19f9610
Migrate to request specs in /api/v1/admin/ip_blocks ( #25331 )
2023-06-10 18:32:46 +02:00
Daniel M Brasil
4301d8cbb3
Migrate to request specs in /api/v1/admin/domain_allows ( #25333 )
2023-06-10 18:32:26 +02:00
Daniel M Brasil
841c220c40
Migrate to request specs in /api/v1/admin/domain_blocks ( #25335 )
2023-06-10 18:32:07 +02:00
Daniel M Brasil
0e200d4e2f
Migrate to request specs in /api/v1/admin/reports ( #25355 )
2023-06-10 18:30:43 +02:00
Daniel M Brasil
4aff1d2974
Migrate to request specs in /api/v1/admin/email_domain_blocks ( #25337 )
2023-06-09 14:00:14 +02:00
