FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/controllers/api/v1
History
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
 		2022-02-26 09:29:23 +01:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-02-11 21:53:20 +01:00
admin Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
announcements
…
apps
…
instances
…
lists Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
polls Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
push Add `policy` param to `POST /api/v1/push/subscriptions` (#16040) 2021-04-15 05:00:25 +02:00
statuses Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
trends Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
accounts_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
announcements_controller_spec.rb
…
apps_controller_spec.rb Fix app name, website and redirect URIs not having a maximum length (#16042) 2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
bookmarks_controller_spec.rb
…
conversations_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
custom_emojis_controller_spec.rb
…
domain_blocks_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
endorsements_controller_spec.rb
…
favourites_controller_spec.rb
…
filters_controller_spec.rb
…
follow_requests_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
instances_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
lists_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
markers_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
media_controller_spec.rb Add editing for published statuses (#17320) 2022-02-10 00:15:30 +01:00
mutes_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
notifications_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
polls_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
reports_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
statuses_controller_spec.rb Add editing for published statuses (#17320) 2022-02-10 00:15:30 +01:00
streaming_controller_spec.rb
…
suggestions_controller_spec.rb
…