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: fe5f6bc7ed

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fe5f6bc7ed'

${ noResults }

microblog/app/controllers/api

History

Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
web	Refactor formatter (#17828)	2 years ago
base_controller.rb	Fix suspended users being able to access APIs that don't require a user (#18524)	2 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	4 years ago