mastodon-docker-playground

Commit Graph

Author	SHA1	Message	Date
Claire	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
Daniel M Brasil	7664e3b692	Migrate to request specs in `/api/v1/statuses/:status_id/source` (#25634 )	2023-10-13 14:08:21 +02:00

Author

SHA1

Message

Date

Claire

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

Daniel M Brasil

7664e3b692

Migrate to request specs in `/api/v1/statuses/:status_id/source` (#25634 )

2023-10-13 14:08:21 +02:00

2 Commits (15bc13c65b3af1b6a23df11a94efdf4fe0db6b3b)