b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
2023-11-06 14:28:20 +00:00
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
2023-10-23 15:46:21 +00:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
e0ed0f8c7c
Migrate to request specs in `/api/v1/notifications` ( #25553 )
2023-10-16 17:15:24 +02:00
cafdaec6cf
Migrate to request specs in `/api/v1/lists/:id/accounts` ( #25468 )
2023-10-16 16:03:48 +02:00
8e6116503d
Migrate to request specs in `/api/v1/blocks` ( #25517 )
2023-10-16 16:03:35 +02:00
d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )
2023-10-16 15:49:12 +02:00
82beeb2f7e
Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )
2023-10-13 16:23:16 +02:00
71cfdd7865
Fix duplicate tests ( #27395 )
2023-10-13 16:10:43 +02:00
058f73a4f5
Add request specs for `/api/v1/reports` ( #25475 )
2023-10-13 15:30:40 +02:00
bc6cd27d9e
Migrate to request specs in `/api/v1/followed_tags` ( #25472 )
2023-10-13 14:43:50 +02:00
fd9dea21d0
DB speedup in `API::` controller/request specs ( #25516 )
2023-10-13 14:42:09 +02:00
ecdb31d479
Migrate to request specs in `/api/v1/favourites` ( #25518 )
2023-10-13 14:19:12 +02:00
7664e3b692
Migrate to request specs in `/api/v1/statuses/:status_id/source` ( #25634 )
2023-10-13 14:08:21 +02:00
4230d1ee0a
Migrate to request specs in `/api/v1/timelines/tag/:hashtag` ( #25797 )
2023-10-13 14:04:37 +02:00
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
828eebad48
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API ( #26998 )
2023-09-20 18:25:16 +02:00
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
20666482ef
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
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
f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
2023-08-23 15:50:23 +02:00
191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
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
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
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
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
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
812a84ff5f
Migrate to request specs in `/api/v2/filters` ( #25721 )
2023-07-27 14:58:20 +02:00
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
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
59b38f9ee4
Migrate to request specs in `/api/v1/mutes` ( #25622 )
2023-07-18 13:05:19 +02:00
58bfe8c43a
Migrate to request specs in `/api/v1/bookmarks` ( #25520 )
2023-07-18 09:15:50 +02:00
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
19208aa422
Migrate to request specs in `/api/v1/statuses/:status_id/favourite` ( #25626 )
2023-07-17 16:53:57 +02:00
6fb4a756ff
Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` ( #25624 )
2023-07-17 16:51:49 +02:00
4859958a0c
Migrate to request specs in `/api/v1/polls` ( #25596 )
2023-07-17 16:50:00 +02:00
1aea938d3d
Migrate to request specs in `/api/v1/statuses/:status_id/pin` ( #25635 )
2023-07-17 16:24:05 +02:00
6cdc8408a9
Migrate to request specs in `/api/v1/emails/confirmations` ( #25686 )
2023-07-17 16:22:33 +02:00
8a1aabaac1
Migrate to request specs in `/api/v1/timelines/home` ( #25743 )
2023-07-17 16:20:11 +02:00
Claire
Matt Jankowski
Daniel M Brasil
Emelia Smith
Robert R George
Christian Schmidt