monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
 		2023-05-08 15:28:36 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
admin Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
announcements Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
crypto Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
emails Enable Rubocop HTTP status rules (#23717) 2023-02-20 11:16:40 +09:00
featured_tags Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
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 Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00
push Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
statuses Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +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 Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00
announcements_controller.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
apps_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
blocks_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
bookmarks_controller.rb Fix 500 error when a bookmark or favorite has been reported and deleted (#18174) 2022-04-28 23:34:58 +02:00
conversations_controller.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01: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 Change featured tag updates to add/remove activity (#19409) 2022-10-22 18:30:55 +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 Fix uncaught 500 error on invalid `replies_policy` (Fix #19097) (#20126) 2022-11-08 16:37:28 +01:00
markers_controller.rb Use Rails' index_by where it makes sense (#15542) 2021-01-12 09:27:38 +01:00
media_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +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 Remove useless `respond_to` calls (#13208) 2020-03-06 01:29:38 +01:00
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 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 Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
tags_controller.rb Change unauthenticated responses to be cached in REST API (#24348) 2023-04-25 15:41:34 +02:00