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

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '7cc76b823a'

${ noResults }

microblog/config

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
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Revamp post filtering system (#18058)	2 years ago
locales-glitch	Make “Flavour and skin” admin setting label translatable (#1791)	2 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.rb	Change search indexing to use batches to minimize resource usage (#18451)	2 years ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 years ago
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2 years ago
database.yml	Format JSON and YAML using Prettier (#17823)	2 years ago
deploy.rb	Bump capistrano from 3.16.0 to 3.17.0 (#17774)	2 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	4 years ago
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	5 years ago
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
sidekiq.yml	Change search indexing to use batches to minimize resource usage (#18451)	2 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	3 years ago
webpacker.yml	Do not try to parse gif files as CSS or JS	5 years ago