queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire ff73d43b35 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change.
2022-04-08 19:53:32 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
admin Fix extremely rare race condition when deleting a toot or account (#17994) 2022-04-08 19:17:37 +02:00
announcements
apps
crypto Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
emails Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743) 2022-03-12 04:14:25 +01:00
featured_tags
instances Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
lists Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
polls
push Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
statuses Add edit history to web UI (#17390) 2022-02-09 01:17:07 +01:00
timelines Fix “Show boosts/replies in public timelines” only affecting streaming 2020-11-12 23:44:53 +01:00
trends Fix pagination header on empty trends responses in REST API (#17986) 2022-04-07 18:06:15 +02:00
accounts_controller.rb Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
announcements_controller.rb
apps_controller.rb
blocks_controller.rb Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
endorsements_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
favourites_controller.rb
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
instances_controller.rb
lists_controller.rb
markers_controller.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
media_controller.rb Allow editing media attachments for scheduled toots (#17690) 2022-03-03 16:13:58 +01:00
mutes_controller.rb Change follow scope to be covered by read and write scopes in REST API (#17678) 2022-03-03 16:13:40 +01:00
notifications_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb Fix report category not being saved in REST API (#17682) 2022-03-02 18:57:08 +01:00
scheduled_statuses_controller.rb
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
streaming_controller.rb
suggestions_controller.rb Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00