mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/controllers/api/v1
History
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
accounts Use hash arguments to `select` when possible (Rails 7.2) (#32917) 2024-11-18 14:58:45 +00:00
admin Increase maximum page size for Admin Domain Management APIs (#31253) 2024-08-02 06:54:48 +00:00
announcements
…
apps Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192) 2024-05-17 13:46:12 +00:00
domain_blocks Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
emails
…
featured_tags Extract constants for controller `LIMIT` queries (#32921) 2024-11-18 09:23:38 +00:00
instances Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
lists Change lists to reflect added and removed users retroactively (#32930) 2024-11-19 10:04:12 +00:00
notifications Fix notification requests from suspended accounts still being listed (#32354) 2024-10-09 17:29:02 +00:00
peers Add `LIMIT` constant for `api/v1/peers/search` endpoint (#31989) 2024-09-20 08:31:58 +00:00
polls Remove un-needed `Poll.attached` scope (#33368) 2024-12-20 15:15:11 +00:00
profile
…
push Fix race condition in `POST /api/v1/push/subscription` (#30166) 2024-05-06 12:41:14 +00:00
statuses Translate to regional language variant (e.g. pt-BR) (#32428) 2024-10-15 13:26:20 +00:00
timelines Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 2024-07-04 17:12:14 +02:00
trends Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
accounts_controller.rb Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
announcements_controller.rb
…
annual_reports_controller.rb Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
apps_controller.rb Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192) 2024-05-17 13:46:12 +00:00
blocks_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
bookmarks_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
conversations_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
custom_emojis_controller.rb
…
directories_controller.rb Eager loading fixes for `api/` controllers (#28848) 2024-01-23 11:41:54 +00:00
domain_blocks_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
endorsements_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
favourites_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
featured_tags_controller.rb
…
filters_controller.rb
…
follow_requests_controller.rb Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
followed_tags_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
instances_controller.rb Update `current_user` override mode description in controllers (#30515) 2024-06-03 07:16:29 +00:00
invites_controller.rb Add support for invite codes in the registration API (#27805) 2023-11-13 13:27:00 +00:00
lists_controller.rb
…
markers_controller.rb Improve `api/v1/markers#create` performance against simultaneous requests (#28718) 2024-01-15 09:47:25 +00:00
media_controller.rb
…
mutes_controller.rb Move `pagination_params` into `API::BaseController` (#28845) 2024-05-30 14:56:48 +00:00
notifications_controller.rb Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream 2024-07-30 20:47:34 +02:00
polls_controller.rb Remove un-needed `Poll.attached` scope (#33368) 2024-12-20 15:15:11 +00:00
preferences_controller.rb
…
reports_controller.rb Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
scheduled_statuses_controller.rb Merge pull request from GHSA-58x8-3qxw-6hm7 2024-07-04 16:26:49 +02:00
statuses_controller.rb Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
streaming_controller.rb Fix potential redirection loop of streaming endpoint (#28665) 2024-01-10 15:05:46 +00:00
suggestions_controller.rb Change algorithm of follow recommendations (#28314) 2023-12-19 10:59:43 +00:00
tags_controller.rb
…