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: 4ed09276d5

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '4ed09276d5'

${ noResults }

microblog/config

History

Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		1 year ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
locales	Remove unused HTML Validator (#23866)	1 year ago
locales-glitch	New Crowdin updates (#2111)	1 year ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
application.rb	Address check-i18n warnings (#23313)	1 year 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	Change postgres connection timeout (#21790)	1 year ago
deploy.rb	Change `master` branch to `main` branch (#20290)	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	1 year 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	feat(puma): enable setting min puma threads in addition to max (#21048)	1 year ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	1 year ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	3 years ago
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago