monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 		2023-06-25 14:27:38 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
admin Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified (#24958) 2023-05-22 13:44:49 +02:00
announcements
…
apps
…
crypto
…
emails Add polling and automatic redirection to `/start` on email confirmation (#25013) 2023-05-16 18:03:52 +02:00
featured_tags
…
instances Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662) 2023-04-26 11:42:47 +02:00
lists Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
polls
…
push Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
statuses Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2023-06-22 14:56:14 +02:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
accounts_controller.rb Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
announcements_controller.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
apps_controller.rb
…
blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
bookmarks_controller.rb
…
conversations_controller.rb Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
custom_emojis_controller.rb Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665) 2023-04-28 10:01:38 +02:00
directories_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
domain_blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
endorsements_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
favourites_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
featured_tags_controller.rb Remove dead code in Api::V1::FeaturedTagsController (#25073) 2023-05-23 14:27:37 +02:00
filters_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
follow_requests_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
followed_tags_controller.rb Fix pagination of followed tags (#20861) 2022-11-17 10:54:10 +01:00
instances_controller.rb Fix some user-independent endpoints potentially reading session cookies (#24650) 2023-04-25 22:14:44 +02:00
lists_controller.rb Add exclusive lists (#22048) 2023-06-05 09:37:02 +02:00
markers_controller.rb
…
media_controller.rb Make it possible to upload audio and video to Heroku app (#24866) 2023-05-05 14:41:07 +02:00
mutes_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
notifications_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
polls_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
preferences_controller.rb
…
reports_controller.rb
…
scheduled_statuses_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
streaming_controller.rb Add allow_other_host in redirects which may go outside app (#24252) 2023-03-26 00:38:32 +01:00
suggestions_controller.rb
…
tags_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00