Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tag: Branch: Tree: 1fbd1fa5c4

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1fbd1fa5c4'

${ noResults }

microblog/spec/controllers/api/v1

History

Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		2 years ago
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin	Spelling (#17705)	2 years ago
announcements	Add announcements (#12662)	4 years ago
apps	Use raw status code on have_http_status (#7214)	6 years ago
instances	Add specs for Api::V1::Instances::PeersController (#9546)	5 years ago
lists	Refactor and improve tests (#17386)	2 years ago
polls	Refactor and improve tests (#17386)	2 years ago
push	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	3 years ago
statuses	Spelling (#17705)	2 years ago
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
trends	Add trending statuses (#17431)	2 years ago
accounts_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
announcements_controller_spec.rb	Add announcements (#12662)	4 years ago
apps_controller_spec.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	3 years ago
blocks_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	5 years ago
conversations_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
domain_blocks_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	5 years ago
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filters_controller_spec.rb	Add polls (#10111)	5 years ago
follow_requests_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
instances_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
lists_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
markers_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
media_controller_spec.rb	Add editing for published statuses (#17320)	2 years ago
mutes_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
notifications_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
polls_controller_spec.rb	Refactor and improve tests (#17386)	2 years ago
reports_controller_spec.rb	Fix report category not being saved in REST API (#17682)	2 years ago
statuses_controller_spec.rb	Spelling (#17705)	2 years ago
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	6 years ago