diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 08:28:17 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 08:28:52 +0100 |
| commit | 2d4b4b0b4545a4dc914c71fa72638f13d21f3d4f (patch) | |
| tree | bfb87120970adeaf62c478505a52a43cc30318fb /spec/controllers/api/v1/instances_controller_spec.rb | |
| parent | a85912b0d6d2ee68aa35794fbb51c5358768c092 (diff) | |
| parent | d5c9feb7b7fc489afbd0a287431fe07b42451ef0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.
Diffstat (limited to 'spec/controllers/api/v1/instances_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions